add section about adding features

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,6 +1,7 @@
 ---
 name: Bug report
 about: Create a report to help us improve
+title: "[Bug] Enter issue title here"
 labels: bug
 assignees: ''
 

.github/ISSUE_TEMPLATE/feature_request.md

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

.github/workflows/cmake-linux.yml

@@ -0,0 +1,44 @@
+name: CMake Linux Build
+
+on: [push]
+
+env:
+  BUILD_TYPE: Release
+
+jobs:
+  linux-build:
+    runs-on: ubuntu-latest
+
+    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
+
+    - 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: Archive artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: BeamMP-Server-linux
+        path: ${{github.workspace}}/build-linux/BeamMP-Server

.github/workflows/cmake-windows.yml

@@ -0,0 +1,58 @@
+name: CMake Windows Build
+
+on: [push]
+
+env:
+  BUILD_TYPE: Release
+
+jobs:
+  windows-build:
+    runs-on: windows-latest
+    
+    steps:
+      - uses: actions/checkout@v2
+        with:
+            submodules: 'recursive'
+      
+      - name: Restore artifacts, or run vcpkg, build and cache artifacts
+        uses: lukka/run-vcpkg@v7
+        id: runvcpkg
+        with:
+            vcpkgArguments: 'lua zlib rapidjson openssl websocketpp curl'
+            vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
+            vcpkgGitCommitId: 'a106de33bbee694e3be6243718aa2a549a692832'
+            vcpkgTriplet: 'x64-windows-static'
+
+      - name: Create Build Environment
+        run: cmake -E make_directory ${{github.workspace}}/build-windows
+
+      - name: Configure CMake
+        shell: bash
+        working-directory: ${{github.workspace}}/build-windows
+        env:
+          beammp_sentry_url: ${{ secrets.BEAMMP_SECRET_SENTRY_URL }}
+        run: cmake $GITHUB_WORKSPACE -DSENTRY_BACKEND=breakpad -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE='${{ runner.workspace }}/b/vcpkg/scripts/buildsystems/vcpkg.cmake' -DVCPKG_TARGET_TRIPLET=x64-windows-static -DBEAMMP_SECRET_SENTRY_URL="$beammp_sentry_url"
+
+      - name: Build
+        working-directory: ${{github.workspace}}/build-windows
+        shell: bash
+        run: cmake --build . --config $BUILD_TYPE
+
+      - name: Archive artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: BeamMP-Server.exe
+          path: ${{github.workspace}}/build-windows/Release/BeamMP-Server.exe
+
+      - name: Build debug
+        working-directory: ${{github.workspace}}/build-windows
+        shell: bash
+        run: |
+          cmake --build . --config Debug
+      
+      - name: Archive debug artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: BeamMP-Server-debug.exe
+          path: ${{github.workspace}}/build-windows/Debug/BeamMP-Server.exe
+

.github/workflows/linux.yml

@@ -1,152 +0,0 @@
-name: Linux
-
-on: [push]
-
-
-env: 
-  VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
-  VCPKG_FORCE_SYSTEM_BINARIES: 1
-  CMAKE_BUILD_TYPE: "Release"
-  DEBIAN_FRONTEND: "noninteractive"
-
-jobs:
-  x86_64-matrix:
-    runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        include:
-          - distro: debian
-            version: 11
-          - distro: debian
-            version: 12
-          - distro: ubuntu
-            version: 22.04
-          - distro: ubuntu
-            version: 20.04
-    container:
-      image: ${{ matrix.distro }}:${{ matrix.version }}
-    steps:
-      - name: get-cmake
-        uses: lukka/get-cmake@v3.28.1
-            
-      - name: Export GitHub Actions cache environment variables
-        uses: actions/github-script@v6
-        with:
-          script: |
-            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-
-      - name: Install git
-        run: |
-          apt-get update -y
-          apt-get install -y git
-
-      - uses: actions/checkout@v2
-        with:
-          submodules: 'recursive'
-
-      - name: Git config safe directory
-        shell: bash
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/1.5-git-safe.sh
-
-      - name: Install Dependencies
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/1-install-deps.sh
-
-      - name: Create Build Environment
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/2-configure.sh '-DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake'
-
-      - name: Build Server
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build.sh
-
-      - name: Archive server artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: BeamMP-Server.${{ matrix.distro }}.${{ matrix.version }}.x86_64
-          path: ./bin/BeamMP-Server
-
-      - name: Archive server debug info artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: debuginfo.${{ matrix.distro }}.${{ matrix.version }}.x86_64
-          path: ./bin/BeamMP-Server.debug
-
-      - name: Build Tests
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build-tests.sh
-
-      - name: Install Runtime Dependencies
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/4-install-runtime-deps.sh
-
-      - name: Test
-        run: ./bin/BeamMP-Server-tests
-
-  arm64-matrix:
-    runs-on: [Linux, ARM64]
-    env:
-      VCPKG_DEFAULT_TRIPLET: "arm64-linux"
-    strategy:
-      matrix:
-        include:
-          - distro: debian
-            version: 11
-          - distro: debian
-            version: 12
-          - distro: ubuntu
-            version: 22.04
-          - distro: ubuntu
-            version: 20.04
-    container:
-      image: ${{ matrix.distro }}:${{ matrix.version }}
-    steps:
-      - name: get-cmake
-        uses: lukka/get-cmake@v3.28.1
-            
-      - name: Export GitHub Actions cache environment variables
-        uses: actions/github-script@v6
-        with:
-          script: |
-            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-
-      - name: Install git
-        run: |
-          apt-get update -y
-          apt-get install -y git
-
-      - uses: actions/checkout@v2
-        with:
-          submodules: 'recursive'
-
-      - name: Git config safe directory
-        shell: bash
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/1.5-git-safe.sh
-
-      - name: Install Dependencies
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/1-install-deps.sh
-
-      - name: Create Build Environment
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/2-configure.sh '-DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake'
-
-      - name: Build Server
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build.sh
-
-      - name: Archive server artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: BeamMP-Server.${{ matrix.distro }}.${{ matrix.version }}.arm64
-          path: ./bin/BeamMP-Server
-
-      - name: Archive server debug info artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: debuginfo.${{ matrix.distro }}.${{ matrix.version }}.arm64
-          path: ./bin/BeamMP-Server.debug
-
-      - name: Build Tests
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build-tests.sh
-
-      - name: Install Runtime Dependencies
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/4-install-runtime-deps.sh
-
-      - name: Test
-        run: ./bin/BeamMP-Server-tests
-

.github/workflows/release-build.yml

@@ -0,0 +1,115 @@
+name: Release Create & Build
+on:
+  push:
+    # Sequence of patterns matched against refs/tags
+    tags:
+    - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+
+env:
+  BUILD_TYPE: Release
+
+jobs:
+  create-release:
+    runs-on: ubuntu-latest
+    name: Create Release
+    outputs: 
+      upload_url: ${{ steps.create_release.outputs.upload_url }} 
+    steps:
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
+          draft: false
+          prerelease: true
+          body: |
+              Files included in this release:
+              - `BeamMP-Server.exe` is the windows build
+              - `BeamMP-Server-linux` is a ubuntu build, so you need the dependencies listed in README.md to run it. For any other distros please build from source as described in README.md.
+
+  upload-release-files-linux:
+    name: Upload Linux Release Files
+    runs-on: ubuntu-latest
+    needs: create-release
+    steps:
+      - uses: actions/checkout@v2
+        with:
+            submodules: 'recursive'
+
+      - name: Install Dependencies
+        run: |
+            sudo apt-get update
+            sudo apt-get install -y libz-dev rapidjson-dev liblua5.3 libssl-dev libwebsocketpp-dev libcurl4-openssl-dev
+
+      - name: Create Build Environment
+        run: cmake -E make_directory ${{github.workspace}}/build-linux
+
+      - name: Configure CMake
+        shell: bash
+        working-directory: ${{github.workspace}}/build-linux
+        env:
+          beammp_sentry_url: ${{ secrets.BEAMMP_SECRET_SENTRY_URL }}
+        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_COMPILER=g++-10 -DBEAMMP_SECRET_SENTRY_URL="$beammp_sentry_url"
+
+      - name: Build
+        working-directory: ${{github.workspace}}/build-linux
+        shell: bash
+        run: cmake --build . --config $BUILD_TYPE
+
+      - name: Upload Release Asset
+        id: upload-release-asset 
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.create-release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
+          asset_path: ${{github.workspace}}/build-linux/BeamMP-Server
+          asset_name: BeamMP-Server-linux
+          asset_content_type: application/x-elf
+
+  upload-release-files-windows:
+    name: Upload Windows Release Files
+    runs-on: windows-latest
+    needs: create-release
+    steps:
+      - uses: actions/checkout@v2
+        with:
+            submodules: 'recursive'
+      
+      - name: Restore artifacts, or run vcpkg, build and cache artifacts
+        uses: lukka/run-vcpkg@v7
+        id: runvcpkg
+        with:
+            vcpkgArguments: 'lua zlib rapidjson openssl websocketpp curl'
+            vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
+            vcpkgGitCommitId: 'a106de33bbee694e3be6243718aa2a549a692832'
+            vcpkgTriplet: 'x64-windows-static'
+
+      - name: Create Build Environment
+        run: cmake -E make_directory ${{github.workspace}}/build-windows
+
+      - name: Configure CMake
+        shell: bash
+        working-directory: ${{github.workspace}}/build-windows
+        env:
+          beammp_sentry_url: ${{ secrets.BEAMMP_SECRET_SENTRY_URL }}
+        run: cmake $GITHUB_WORKSPACE -DSENTRY_BACKEND=breakpad -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE='${{ runner.workspace }}/b/vcpkg/scripts/buildsystems/vcpkg.cmake' -DVCPKG_TARGET_TRIPLET=x64-windows-static -DBEAMMP_SECRET_SENTRY_URL="$beammp_sentry_url"
+
+      - name: Build
+        working-directory: ${{github.workspace}}/build-windows
+        shell: bash
+        run: cmake --build . --config $BUILD_TYPE
+
+      - name: Upload Release Asset
+        id: upload-release-asset 
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.create-release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
+          asset_path: ${{github.workspace}}/build-windows/Release/BeamMP-Server.exe
+          asset_name: BeamMP-Server.exe
+          asset_content_type: application/vnd.microsoft.portable-executable

.github/workflows/release.yml

@@ -1,214 +0,0 @@
-name: Release Create & Build
-on:
-  push:
-    # Sequence of patterns matched against refs/tags
-    tags:
-    - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
-
-env:
-  VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
-  CMAKE_BUILD_TYPE: "Release"
-  DEBIAN_FRONTEND: "noninteractive"
-
-jobs:
-  create-release:
-    runs-on: ubuntu-latest
-    name: Create Release
-    outputs: 
-      upload_url: ${{ steps.create_release.outputs.upload_url }} 
-    steps:
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: ${{ github.ref }}
-          draft: false
-          prerelease: true
-          body: |
-            Files included in this release are:
-            - `BeamMP-Server.$DISTRO.$DISTROVERSION.$ARCH` for linux builds, for example `BeamMP-Server.debian.11.x86_64` for the Debian 11 build for x86_64. All require `liblua5.3` to be installed.
-            - `BeamMP-Server.exe` for the Windows build (x86_64). You need to install the [Visual C++ Redistributables](https://aka.ms/vs/17/release/vc_redist.x64.exe) to run this.
-
-  x86_64-matrix:
-    runs-on: ubuntu-22.04
-    needs: create-release
-    strategy:
-      matrix:
-        include:
-          - distro: debian
-            version: 11
-          - distro: debian
-            version: 12
-          - distro: ubuntu
-            version: 22.04
-          - distro: ubuntu
-            version: 20.04
-    container:
-      image: ${{ matrix.distro }}:${{ matrix.version }}
-    steps:
-      - name: get-cmake
-        uses: lukka/get-cmake@v3.28.1
-            
-      - name: Export GitHub Actions cache environment variables
-        uses: actions/github-script@v6
-        with:
-          script: |
-            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-
-      - name: Install git
-        run: |
-          apt-get update -y
-          apt-get install -y git
-
-      - uses: actions/checkout@v2
-        with:
-          submodules: 'recursive'
-
-      - name: Git config safe directory
-        shell: bash
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/1.5-git-safe.sh
-
-      - name: Install Dependencies
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/1-install-deps.sh
-
-      - name: Create Build Environment
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/2-configure.sh '-DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake'
-
-      - name: Build Server
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build.sh
-
-      - name: Upload Release Asset
-        id: upload-release-asset 
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          asset_name: BeamMP-Server.${{ matrix.distro }}.${{ matrix.version }}.x86_64
-          upload_url: ${{ needs.create-release.outputs.upload_url }}
-          asset_path: ./bin/BeamMP-Server
-          asset_content_type: application/x-elf
-
-      - name: Upload Debug Info
-        id: upload-debug-info
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          asset_name: debuginfo.${{ matrix.distro }}.${{ matrix.version }}.x86_64
-          upload_url: ${{ needs.create-release.outputs.upload_url }}
-          asset_path: ./bin/BeamMP-Server.debug
-          asset_content_type: application/x-elf
-
-  arm64-matrix:
-    runs-on: [Linux, ARM64]
-    needs: create-release
-    strategy:
-      matrix:
-        include:
-          - distro: debian
-            version: 11
-          - distro: debian
-            version: 12
-          - distro: ubuntu
-            version: 22.04
-          - distro: ubuntu
-            version: 20.04
-    env:
-      VCPKG_DEFAULT_TRIPLET: "arm64-linux"
-    container:
-      image: ${{ matrix.distro }}:${{ matrix.version }}
-    steps:
-      - name: get-cmake
-        uses: lukka/get-cmake@v3.28.1
-            
-      - name: Export GitHub Actions cache environment variables
-        uses: actions/github-script@v6
-        with:
-          script: |
-            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-
-      - name: Install git
-        run: |
-          apt-get update -y
-          apt-get install -y git
-
-      - uses: actions/checkout@v2
-        with:
-          submodules: 'recursive'
-
-      - name: Git config safe directory
-        shell: bash
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/1.5-git-safe.sh
-
-      - name: Install Dependencies
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/1-install-deps.sh
-
-      - name: Create Build Environment
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/2-configure.sh '-DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake'
-
-      - name: Build Server
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build.sh
-
-      - name: Upload Release Asset
-        id: upload-release-asset 
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          asset_name: BeamMP-Server.${{ matrix.distro }}.${{ matrix.version }}.arm64
-          upload_url: ${{ needs.create-release.outputs.upload_url }}
-          asset_path: ./bin/BeamMP-Server
-          asset_content_type: application/x-elf
-
-      - name: Upload Debug Info
-        id: upload-debug-info
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          asset_name: debuginfo.${{ matrix.distro }}.${{ matrix.version }}.arm64
-          upload_url: ${{ needs.create-release.outputs.upload_url }}
-          asset_path: ./bin/BeamMP-Server.debug
-          asset_content_type: application/x-elf
-
-  upload-release-files-windows:
-    name: Build and upload Windows Release Files
-    runs-on: windows-latest
-    needs: create-release
-    env:
-      VCPKG_DEFAULT_TRIPLET: x64-windows-static
-    steps:
-      - name: Export GitHub Actions cache environment variables
-        uses: actions/github-script@v6
-        with:
-          script: |
-            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-
-      - uses: actions/checkout@v2
-        with:
-          submodules: 'recursive'
-
-      - name: Create Build Environment
-        shell: bash
-        run: ./scripts/windows/1-configure.sh
-
-      - name: Build Server
-        shell: bash
-        run: bash ./scripts/windows/2-build.sh
-
-      - name: Upload Release Asset
-        id: upload-release-asset 
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.create-release.outputs.upload_url }}
-          asset_path: ./bin/Release/BeamMP-Server.exe
-          asset_name: BeamMP-Server.exe
-          asset_content_type: application/vnd.microsoft.portable-executable

.github/workflows/windows.yml

@@ -1,43 +0,0 @@
-name: Windows
-
-on: [push]
-
-env:
-  VCPKG_DEFAULT_TRIPLET: x64-windows-static
-  VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
-  CMAKE_BUILD_TYPE: "Release"
-
-jobs:
-  windows-build:
-    runs-on: windows-latest
-    steps:
-      - name: Export GitHub Actions cache environment variables
-        uses: actions/github-script@v6
-        with:
-          script: |
-            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-
-      - uses: actions/checkout@v2
-        with:
-          submodules: 'recursive'
-
-      - name: Setup vcpkg
-        uses: lukka/run-vcpkg@v11
-        with:
-          runVcpkgInstall: true
-
-      - name: Create Build Environment
-        shell: bash
-        run: ./scripts/windows/1-configure.sh
-
-      - name: Build Server
-        shell: bash
-        run: bash ./scripts/windows/2-build.sh
-
-      - name: Archive server artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: BeamMP-Server-windows
-          path: ./bin/Release/BeamMP-Server.exe
-

.gitmodules

@@ -1,9 +1,27 @@
 [submodule "deps/commandline"]
 	path = deps/commandline
 	url = https://github.com/lionkor/commandline
-[submodule "vcpkg"]
+[submodule "deps/asio"]
-	path = vcpkg
+	path = deps/asio
-	url = https://github.com/Microsoft/vcpkg.git
+	url = https://github.com/chriskohlhoff/asio
-[submodule "deps/BeamMP-Protocol"]
+[submodule "deps/rapidjson"]
-	path = deps/BeamMP-Protocol
+	path = deps/rapidjson
-	url = https://github.com/BeamMP/BeamMP-Protocol
+	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

CMakeLists.txt

@@ -1,215 +1,169 @@
-cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.0)
 
-if (WIN32)
+message(STATUS "You can find build instructions and a list of dependencies in the README at \
-    set(VCPKG_TARGET_TRIPLET x64-windows-static)
+https://github.com/BeamMP/BeamMP-Server")
+
+project(BeamMP-Server
+    DESCRIPTION "Server for BeamMP - The Multiplayer Mod for BeamNG.drive"
+    HOMEPAGE_URL https://beammp.com
+    LANGUAGES CXX C)
+
+set(HTTPLIB_REQUIRE_OPENSSL ON)
+
+include_directories("${PROJECT_SOURCE_DIR}/deps/asio/asio/include")
+include_directories("${PROJECT_SOURCE_DIR}/deps/rapidjson/include")
+include_directories("${PROJECT_SOURCE_DIR}/deps/websocketpp")
+include_directories("${PROJECT_SOURCE_DIR}/deps/commandline")
+include_directories("${PROJECT_SOURCE_DIR}/deps/sol2/include")
+include_directories("${PROJECT_SOURCE_DIR}/deps/cpp-httplib")
+include_directories("${PROJECT_SOURCE_DIR}/deps/json/single_include")
+include_directories("${PROJECT_SOURCE_DIR}/deps")
+
+add_compile_definitions(CPPHTTPLIB_OPENSSL_SUPPORT)
+
+if(APPLE)
+    set(LUA_INCLUDE_DIR /usr/local/Cellar/lua@5.3/5.3.6/include/lua5.3)
+    set(LUA_LIBRARIES lua)
+    include_directories(/usr/local/opt/openssl@1.1/include)
+    link_directories(/usr/local/Cellar/lua@5.3/5.3.6/lib)
+    link_directories(/usr/local/opt/openssl@1.1/lib)
 endif()
 
-include(cmake/Vcpkg.cmake) # needs to happen before project()
+if (WIN32)
-
+    # this has to happen before sentry, so that crashpad on windows links with these settings.
-project(
+    message(STATUS "MSVC -> forcing use of statically-linked runtime.")
-    "BeamMP-Server" # replace this
+    STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
-    VERSION 3.3.0
+    STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
-)
-
-include(cmake/StandardSettings.cmake)
-include(cmake/StaticAnalyzers.cmake)
-include(cmake/Git.cmake)
-
-add_subdirectory(deps/BeamMP-Protocol)
-
-# below are options which should be changed
-
-### SETTINGS ###
-
-# add all headers (.h, .hpp) to this
-set(PRJ_HEADERS 
-    include/ArgsParser.h
-    include/BoostAliases.h
-    include/Common.h
-    include/Compat.h
-    include/Cryptography.h
-    include/CustomAssert.h
-    include/Defer.h
-    include/Environment.h
-    include/Http.h
-    include/IThreaded.h
-    include/Json.h
-    include/LuaAPI.h
-    include/RWMutex.h
-    include/SignalHandling.h
-    include/TConfig.h
-    include/TConsole.h
-    include/THeartbeatThread.h
-    include/TLuaEngine.h
-    include/TLuaPlugin.h
-    include/TPluginMonitor.h
-    include/TScopedTimer.h
-    include/VehicleData.h
-    include/Env.h
-    include/Network.h
-)
-# add all source files (.cpp) to this, except the one with main()
-set(PRJ_SOURCES
-    src/ArgsParser.cpp
-    src/Common.cpp
-    src/Compat.cpp
-    src/Http.cpp
-    src/LuaAPI.cpp
-    src/SignalHandling.cpp
-    src/TConfig.cpp
-    src/TConsole.cpp
-    src/THeartbeatThread.cpp
-    src/TLuaEngine.cpp
-    src/TLuaPlugin.cpp
-    src/TPluginMonitor.cpp
-    src/TScopedTimer.cpp
-    src/VehicleData.cpp
-    src/Env.cpp
-    src/Network.cpp
-)
-
-find_package(Lua REQUIRED)
-
-# set the source file containing main()
-set(PRJ_MAIN src/main.cpp)
-# set the source file containing the test's main
-set(PRJ_TEST_MAIN test/test_main.cpp)
-# set include paths not part of libraries
-set(PRJ_INCLUDE_DIRS ${LUA_INCLUDE_DIR})
-# set compile features (e.g. standard version)
-set(PRJ_COMPILE_FEATURES cxx_std_20)
-# set #defines (test enable/disable not included here)
-set(PRJ_DEFINITIONS CPPHTTPLIB_OPENSSL_SUPPORT)
-# add all libraries used by the project (WARNING: also set them in vcpkg.json!)
-set(PRJ_LIBRARIES 
-    fmt::fmt
-    doctest::doctest
-    Threads::Threads
-    commandline_static
-    toml11::toml11
-    rapidjson
-    sol2
-    httplib::httplib
-    libzip::zip
-    OpenSSL::SSL OpenSSL::Crypto
-    protocol
-    ${LUA_LIBRARIES}
-    zstd::libzstd_static
-    Boost::thread
-    glm::glm
-)
-
-# add dependency find_package calls and similar here
-find_package(fmt CONFIG REQUIRED)
-find_package(OpenSSL REQUIRED)
-find_package(doctest CONFIG REQUIRED)
-find_package(Boost REQUIRED COMPONENTS thread)
-find_package(httplib CONFIG REQUIRED)
-find_package(libzip CONFIG REQUIRED)
-find_package(RapidJSON CONFIG REQUIRED)
-find_package(sol2 CONFIG REQUIRED)
-find_package(toml11 CONFIG REQUIRED)
-find_package(zstd CONFIG REQUIRED)
-find_package(glm CONFIG REQUIRED)
-
-include_directories(include)
-
-# to enable multithreading and the Threads::Threads dependency
-include(FindThreads)
-
-### END SETTINGS ###
-
-# DONT change anything beyond this point unless you've read the cmake bible and 
-# swore on it not to bonk up the ci/cd pipelines with your changes.
-
-####################
-
-
-# enables compile_commands.json for clang-related tools (such as the clang LS)
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-
-# build release builds by default (if not specified otherwise)
-if(NOT DEFINED CMAKE_BUILD_TYPE)
-    message(NOTICE "No build type specified, defaulting to 'Release'")
-    set(CMAKE_BUILD_TYPE "Release")
 endif()
 
-if(UNIX)
+include_directories("include/sentry-native/include")
-    # this will allow to use same _DEBUG macro available in both Linux as well as Windows - MSCV environment. Easy to put Debug specific code.
+set(BUILD_SHARED_LIBS OFF)
-    add_compile_options("$<$<CONFIG:DEBUG>:-D_DEBUG>")
+if (MSVC)
-endif(UNIX)
+    set(SENTRY_BUILD_RUNTIMESTATIC ON)
+endif()
+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()
+    string(LENGTH ${BEAMMP_SECRET_SENTRY_URL} URL_LEN)
+    message(STATUS "Sentry URL is length ${URL_LEN}")
+    set(SENTRY_BACKEND breakpad)
+endif()
+add_subdirectory("deps/sentry-native")
 
-if (WIN32)
+if (MSVC)
-    add_compile_options("-D_WIN32_WINNT=0x0601")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
-endif(WIN32)
-
-
-include(cmake/CompilerWarnings.cmake)
-
-# set MT library for msvc - this is required (says documentation)
-# linux/mac/etc should simply ignore this by default.
-set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-
-set(PRJ_DEFINITIONS ${PRJ_DEFINITIONS}
-    PRJ_VERSION_MAJOR=${PROJECT_VERSION_MAJOR}
-    PRJ_VERSION_MINOR=${PROJECT_VERSION_MINOR}
-    PRJ_VERSION_PATCH=${PROJECT_VERSION_PATCH}
-)
-
-# build commandline manually for funky windows flags to carry over without a custom toolchain file
-add_library(commandline_static 
-    deps/commandline/src/impls.h
-    deps/commandline/src/windows_impl.cpp
-    deps/commandline/src/linux_impl.cpp
-    deps/commandline/src/backends/InteractiveBackend.cpp
-    deps/commandline/src/backends/InteractiveBackend.h
-    deps/commandline/src/backends/Backend.cpp
-    deps/commandline/src/backends/Backend.h
-    deps/commandline/src/commandline.h
-    deps/commandline/src/commandline.cpp
-    deps/commandline/src/backends/BufferedBackend.cpp
-    deps/commandline/src/backends/BufferedBackend.h
-)
-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})
+message(STATUS "Adding local source dependencies")
-set_target_properties(${PROJECT_NAME} PROPERTIES
+# this has to happen before -DDEBUG since it wont compile properly with -DDEBUG
-    MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
+add_subdirectory(deps)
-    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)
+message(STATUS "Setting compiler flags")
-    target_link_options(${PROJECT_NAME} PRIVATE "/SUBSYSTEM:CONSOLE")
+if (WIN32)
-endif(MSVC)
 
-# setup all warnings (from cmake/CompilerWarnings.cmake)
+    #-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static
-set_project_warnings(${PROJECT_NAME})
+    set(VcpkgRoot ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET})
+    include_directories(${VcpkgRoot}/include)
+    link_directories(${VcpkgRoot}/lib)
+elseif (UNIX)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -static-libstdc++")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -fno-builtin")
+    if (SANITIZE)
+        message(STATUS "sanitize is ON")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined,thread")
+    endif (SANITIZE)
+endif ()
 
-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})
+set(CMAKE_CXX_STANDARD 17)
-    target_include_directories(${PROJECT_NAME}-tests PRIVATE ${PRJ_INCLUDE_DIRS})
+
-    target_link_libraries(${PROJECT_NAME}-tests ${PRJ_LIBRARIES})
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
-    target_compile_features(${PROJECT_NAME}-tests PRIVATE ${PRJ_COMPILE_FEATURES})
+
-    target_compile_definitions(${PROJECT_NAME}-tests PRIVATE ${PRJ_DEFINITIONS} ${PRJ_WARNINGS})
+add_executable(BeamMP-Server
-    set_project_warnings(${PROJECT_NAME}-tests)
+        src/main.cpp
-    if(MSVC)
+        include/TConsole.h src/TConsole.cpp
-        target_link_options(${PROJECT_NAME}-tests PRIVATE "/SUBSYSTEM:CONSOLE")
+        include/TServer.h src/TServer.cpp
-    endif(MSVC)
+        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/Environment.h)
+
+target_compile_definitions(BeamMP-Server PRIVATE SECRET_SENTRY_URL="${BEAMMP_SECRET_SENTRY_URL}")
+include_directories(BeamMP-Server PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
+
+target_include_directories(BeamMP-Server PUBLIC 
+    "${CMAKE_CURRENT_SOURCE_DIR}/include" 
+    "${CMAKE_CURRENT_SOURCE_DIR}/commandline")
+
+if (APPLE)
+    message(STATUS "NOT looking for Lua on APPLE")
+else()
+    message(STATUS "Looking for Lua")
+    find_package(Lua REQUIRED VERSION 5.3)
 endif()
 
+target_include_directories(BeamMP-Server PUBLIC 
+    ${LUA_INCLUDE_DIR} 
+    ${CURL_INCLUDE_DIRS}
+    "include/tomlplusplus" 
+    "include/sentry-native/include"
+    "include/curl/include")
+
+message(STATUS "Looking for SSL")
+
+if (APPLE)
+    set(OPENSSL_LIBRARIES ssl crypto)
+else()
+    find_package(OpenSSL REQUIRED)
+endif()
+
+target_link_libraries(BeamMP-Server sol2::sol2 ${LUA_LIBRARIES})
+message(STATUS "CURL IS ${CURL_LIBRARIES}")
+
+if (UNIX)
+    target_link_libraries(BeamMP-Server
+        z 
+        pthread
+        ${LUA_LIBRARIES} 
+        crypto
+        ${OPENSSL_LIBRARIES} 
+        commandline 
+        sentry
+        ssl)
+elseif (WIN32)
+    include(FindLua)
+    message(STATUS "Looking for libz")
+    find_package(ZLIB REQUIRED)
+    message(STATUS "Looking for RapidJSON")
+    find_package(RapidJSON CONFIG REQUIRED)
+    target_include_directories(BeamMP-Server PRIVATE ${RAPIDJSON_INCLUDE_DIRS})
+    target_link_libraries(BeamMP-Server
+        ws2_32 
+        ZLIB::ZLIB 
+        ${LUA_LIBRARIES} 
+        ${OPENSSL_LIBRARIES} 
+        commandline
+        sentry)
+endif ()

Changelog.md

@@ -0,0 +1,123 @@
+# 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

README.md

@@ -6,12 +6,13 @@
 This is the server for the multiplayer mod **[BeamMP](https://beammp.com/)** for the game [BeamNG.drive](https://www.beamng.com/).
 The server is the point through which all clients communicate. You can write Lua mods for the server, there are detailed instructions on the [BeamMP Wiki](https://wiki.beammp.com).
 
-**For Linux, you __need__ the runtime dependencies, which are listed below under [Runtime Dependencies](#runtime-dependencies)**
+**For Linux, you __need__ the runtime dependencies, listed below under "[prerequisites](#prerequisites)".**
 
 ## Support + Contact
 
 Feel free to ask any questions via the following channels:
 
+- **IRC**: `#beammp` on [irc.libera.chat](https://web.libera.chat/)
 - **Discord**: [click for invite](https://discord.gg/beammp)
 - **BeamMP Forum**: [BeamMP Forum Support](https://forum.beammp.com/c/support/33)
 
@@ -28,7 +29,7 @@ These values are guesstimated and are subject to change with each release.
 
 ## Contributing
 
-TLDR; [Issues](https://github.com/BeamMP/BeamMP-Server/issues) with the "help wanted" or "good first issue" label or with nobody assigned.
+TLDR; [Issues](https://github.com/BeamMP/BeamMP-Server/issues) with the "help wanted" label or with nobody assigned.
 
 To contribute, look at the active [issues](https://github.com/BeamMP/BeamMP-Server/issues). Any issues that have the "help wanted" label or don't have anyone assigned are good tasks to take on. You can either contribute by programming or by testing and adding more info and ideas.
 
@@ -38,11 +39,11 @@ If you need support with understanding the codebase, please write us in the Disc
 
 ## About Building from Source
 
-We only allow building unmodified (original) source code for public use. `master` is considered **unstable** and we will not provide technical support if such a build doesn't work, so always build from a tag. You can checkout a tag with `git checkout tags/TAGNAME`, where `TAGNAME` is the tag, for example `v3.1.0`. 
+We only allow building unmodified (original) source code for public use. `master` is considered **unstable** and we will not provide technical support if such a build doesn't work, so always build from a tag. You can checkout a tag with `git checkout tags/TAGNAME`, where `TAGNAME` is the tag, for example `v1.20`. 
 
 ## Supported Operating Systems
 
-The code itself supports (latest stable) Linux and Windows. In terms of actual build support, for now we usually only distribute Windows binaries and Linux. For any other distro or OS, you just have to find the same libraries listed in [Runtime Dependencies](#runtime-dependencies) further down the page, and it should build fine.
+The code itself supports (latest stable) Linux and Windows. In terms of actual build support, for now we usually only distribute Windows binaries and sometimes Linux. For any other distro or OS, you just have to find the same libraries listed in the Linux Build [Prerequisites](#prerequisites) further down the page, and it should build fine. We don't currently support any big-endian architectures.
 
 Recommended compilers: MSVC, GCC, CLANG. 
 
@@ -50,37 +51,59 @@ You can find precompiled binaries under [Releases](https://github.com/BeamMP/Bea
 
 ## Build Instructions
 
-On Linux, you need some dependencies to **build** the server (on Windows, you don't):
+**__Do not compile from `master`. Always build from a release tag, i.e. `tags/v2.3.3`!__**
 
+Currently only Linux and Windows are supported (generally). See [Releases](https://github.com/BeamMP/BeamMP-Server/releases/) for official binary releases. On systems to which we do not provide binaries (so anything but windows), you are allowed to compile the program and use it. Other restrictions, such as not being allowed to distribute those binaries, still apply (see [copyright notice](#copyright)).
+
+### Prerequisites
+
+#### Windows
+
+Please use the prepackaged binaries in [Releases](https://github.com/BeamMP/BeamMP-Server/releases/).
+
+Dependencies for **Windows** can be installed with `vcpkg`.
+These are:
 ```
-liblua5.3-dev curl zip unzip tar cmake make git g++
+lua
+zlib
+rapidjson
+openssl
+websocketpp
+curl
 ```
 
-You can install these with your distribution's package manager. You will need sudo or need root for ONLY this step.
+#### Linux
 
-The names of each package may change depending on your platform.
+Runtime dependencies - you want to find packages for:
+- libz
+- rapidjson
+- lua5.3
+- ssl / openssl
+- websocketpp
+- curl (with ssl support)
 
-If you are building for ARM (like aarch64), you need to run `export VCPKG_FORCE_SYSTEM_BINARIES=1` before the following commands.
+Build-time dependencies are:
+```
+git
+make
+cmake
+g++
+```
 
-You can build on **Windows, Linux** or other platforms by following these steps:
+### How to build
 
-1. Check out the repository with git: `git clone --recursive https://github.com/BeamMP/BeamMP-Server`.
+On Windows, use git-bash for these commands. On Linux, these should work in your shell.
-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.
+1. Make sure you have all [prerequisites](#prerequisites) installed
+2. Clone the repository in a location of your choice with `git clone --recurse-submodules https://github.com/BeamMP/BeamMP-Server`. 
+3. Change into the BeamMP-Server directory by running `cd BeamMP-Server`. 
+4. Checkout the branch of the release you want to compile, for example `git checkout tags/v3.0.2` for version 3.0.2. You can find the latest version [here](https://github.com/BeamMP/BeamMP-Server/tags).
+5. Ensure that all submodules are initialized by running `git submodule update --init --recursive`
+6. Run `cmake . -DCMAKE_BUILD_TYPE=Release` (with `.`)
+7. Run `make`
+8. You will now have a `BeamMP-Server` file in your directory, which is executable with `./BeamMP-Server` (`.\BeamMP-Server.exe` for windows). Follow the (Windows or Linux, doesnt matter) instructions on the [wiki](https://wiki.beammp.com/en/home/server-installation) for further setup after installation (which we just did), such as port-forwarding and getting a key to actually run the server.
 
-### Runtime Dependencies
+*tip: to run the server in the background, simply (in bash, zsh, etc) run:* `nohup ./BeamMP-Server &`*.*
-
-These are needed to *run* the server.
-
-Debian, Ubuntu and friends: `liblua5.3-0`
-
-Other Linux distros: `liblua` of *some kind*.
-
-Windows: No libraries.
 
 ## Support
 The BeamMP project is supported by community donations via our [Patreon](https://www.patreon.com/BeamMP). This brings perks such as Patreon-only channels on our Discord, early access to new updates, and more server keys. 

cmake/CompilerWarnings.cmake

@@ -1,114 +0,0 @@
-# from here:
-#
-# https://github.com/lefticus/cppbestpractices/blob/master/02-Use_the_Tools_Available.md
-# Courtesy of Jason Turner
-# License here: https://github.com/cpp-best-practices/cppbestpractices/blob/master/LICENSE
-# 
-# This version has been modified by the owners of the current respository.
-# Modifications have mostly been marked with "modified" or similar, though this is not 
-# strictly required.
-
-function(set_project_warnings project_name)
-    set(MSVC_WARNINGS
-            /W4         # Baseline reasonable warnings
-            /w14242 # 'identifier': conversion from 'type1' to 'type1', possible loss
-                            # of data
-            /w14254 # 'operator': conversion from 'type1:field_bits' to
-                            # 'type2:field_bits', possible loss of data
-            /w14263 # 'function': member function does not override any base class
-                            # virtual member function
-            /w14265 # 'classname': class has virtual functions, but destructor is not
-                            # virtual instances of this class may not be destructed correctly
-            /w14287 # 'operator': unsigned/negative constant mismatch
-            /we4289 # nonstandard extension used: 'variable': loop control variable
-                            # declared in the for-loop is used outside the for-loop scope
-            /w14296 # 'operator': expression is always 'boolean_value'
-            /w14311 # 'variable': pointer truncation from 'type1' to 'type2'
-            /w14545 # expression before comma evaluates to a function which is missing
-                            # an argument list
-            /w14546 # function call before comma missing argument list
-            /w14547 # 'operator': operator before comma has no effect; expected
-                            # operator with side-effect
-            /w14549 # 'operator': operator before comma has no effect; did you intend
-                            # 'operator'?
-            /w14555 # expression has no effect; expected expression with side- effect
-            /w14619 # pragma warning: there is no warning number 'number'
-            /w14640 # Enable warning on thread un-safe static member initialization
-            /w14826 # Conversion from 'type1' to 'type_2' is sign-extended. This may
-                            # cause unexpected runtime behavior.
-            /w14905 # wide string literal cast to 'LPSTR'
-            /w14906 # string literal cast to 'LPWSTR'
-            /w14928 # illegal copy-initialization; more than one user-defined
-                            # conversion has been implicitly applied
-            /permissive- # standards conformance mode for MSVC compiler.
-    )
-
-    set(CLANG_WARNINGS
-            -Wall
-            -Wextra    # reasonable and standard
-            -Wshadow # warn the user if a variable declaration shadows one from a
-                             # parent context
-            -Wnon-virtual-dtor # warn the user if a class with virtual functions has a
-                                                 # non-virtual destructor. This helps catch hard to
-                                                 # track down memory errors
-            -Wold-style-cast # warn for c-style casts
-            -Wcast-align         # warn for potential performance problem casts
-            -Wunused                 # warn on anything being unused
-            -Woverloaded-virtual # warn if you overload (not override) a virtual
-                                                     # function
-            -Wpedantic     # warn if non-standard C++ is used
-            -Wconversion # warn on type conversions that may lose data
-            -Wsign-conversion    # warn on sign conversions
-            -Wnull-dereference # warn if a null dereference is detected
-            -Wdouble-promotion # warn if float is implicit promoted to double
-            -Wformat=2 # warn on security issues around functions that format output
-                                 # (ie printf)
-            # modified; added more errors / warnings
-            # some have been set to be errors, but the option _WARNINGS_AS_ERRORS
-            # (see below) should still be used in strict pipelines.
-            -Werror=uninitialized
-            -Werror=float-equal
-            -Werror=write-strings
-            -Werror=strict-aliasing -fstrict-aliasing
-            -Werror=missing-declarations
-            -Werror=ctor-dtor-privacy
-            -Wno-missing-field-initializers
-            -Wswitch-default
-            -Werror=unused-result
-            -Werror=implicit-fallthrough
-            -Werror=return-type
-            -Wmissing-include-dirs
-    )
-
-    if (${PROJECT_NAME}_WARNINGS_AS_ERRORS)
-        set(CLANG_WARNINGS ${CLANG_WARNINGS} -Werror)
-        set(MSVC_WARNINGS ${MSVC_WARNINGS} /WX)
-    endif()
-
-    set(GCC_WARNINGS
-            ${CLANG_WARNINGS}
-            -Wmisleading-indentation # warn if indentation implies blocks where blocks
-                                                             # do not exist
-            -Wduplicated-cond # warn if if / else chain has duplicated conditions
-            -Wduplicated-branches # warn if if / else branches have duplicated code
-            -Wlogical-op     # warn about logical operations being used where bitwise were
-                                         # probably wanted
-            # -Wuseless-cast # warn if you perform a cast to the same type (modified: removed)
-    )
-
-    if(MSVC)
-        set(PRJ_WARNINGS ${MSVC_WARNINGS})
-    elseif(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
-        set(PRJ_WARNINGS ${CLANG_WARNINGS})
-    elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-        set(PRJ_WARNINGS ${GCC_WARNINGS})
-    else()
-        message(AUTHOR_WARNING "No compiler warnings set for '${CMAKE_CXX_COMPILER_ID}' compiler.")
-    endif()
-
-    target_compile_options(${project_name} PUBLIC ${PRJ_WARNINGS})
-
-    if(NOT TARGET ${project_name})
-        message(AUTHOR_WARNING "${project_name} is not a target, thus no compiler warning were added.")
-    endif()
-endfunction()

cmake/Git.cmake

@@ -1,21 +0,0 @@
-find_package(Git)
-if(${PROJECT_NAME}_CHECKOUT_GIT_SUBMODULES)
-    if(Git_FOUND)
-        message(STATUS "Git found, submodule update and init")
-        execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
-                        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-                        RESULT_VARIABLE GIT_SUBMOD_RESULT)
-        if(NOT GIT_SUBMOD_RESULT EQUAL "0")
-            message(SEND_ERROR "git submodule update --init --recursive failed with ${GIT_SUBMOD_RESULT}, please checkout submodules. This may result in missing dependencies.")
-        endif()
-    else()
-        message(SEND_ERROR "git required for checking out submodules, but not found. Submodules will not be checked out - this may result in missing dependencies.")
-    endif()
-endif()
-
-if(Git_FOUND)
-
-else()
-    message(STATUS "Git not found - the version will not include a git hash.")
-    set(PRJ_GIT_HASH "unknown")
-endif()

cmake/StandardSettings.cmake

@@ -1,44 +0,0 @@
-# Modified, original version from https://github.com/filipdutescu/modern-cpp-template (Unlicense)
-
-option(${PROJECT_NAME}_WARNINGS_AS_ERRORS "Treat compiler warnings as errors." OFF)
-option(${PROJECT_NAME}_CHECKOUT_GIT_SUBMODULES "If git is found, initialize all submodules." ON)
-option(${PROJECT_NAME}_ENABLE_UNIT_TESTING "Enable unit tests for the projects (from the `test` subfolder)." ON)
-option(${PROJECT_NAME}_ENABLE_CLANG_TIDY "Enable static analysis with Clang-Tidy." OFF)
-option(${PROJECT_NAME}_ENABLE_CPPCHECK "Enable static analysis with Cppcheck." OFF)
-# TODO Implement code coverage
-# option(${PROJECT_NAME}_ENABLE_CODE_COVERAGE "Enable code coverage through GCC." OFF)
-option(${PROJECT_NAME}_ENABLE_DOXYGEN "Enable Doxygen documentation builds of source." OFF)
-
-# Generate compile_commands.json for clang based tools
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-
-# Export all symbols when building a shared library
-if(BUILD_SHARED_LIBS)
-    set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS OFF)
-    set(CMAKE_CXX_VISIBILITY_PRESET hidden)
-    set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
-endif()
-
-option(${PROJECT_NAME}_ENABLE_LTO "Enable Interprocedural Optimization, aka Link Time Optimization (LTO)." OFF)
-if(${PROJECT_NAME}_ENABLE_LTO)
-    include(CheckIPOSupported)
-    check_ipo_supported(RESULT result OUTPUT output)
-    if(result)
-        set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
-    else()
-        message(SEND_ERROR "IPO is not supported: ${output}.")
-    endif()
-endif()
-
-option(${PROJECT_NAME}_ENABLE_CCACHE "Enable the usage of Ccache, in order to speed up rebuild times." ON)
-find_program(CCACHE_FOUND ccache)
-if(CCACHE_FOUND)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
-endif()
-
-option(${PROJECT_NAME}_ENABLE_SANITIZER "Enable sanitizer to detect memory errors, undefined behavior, etc. (slows down the executable)." OFF)
-if(${PROJECT_NAME}_ENABLE_SANITIZER)
-    add_compile_options(-fsanitize=address,undefined)
-    add_link_options(-fsanitize=address,undefined)
-endif()

cmake/StaticAnalyzers.cmake

@@ -1,20 +0,0 @@
-if(${PROJECT_NAME}_ENABLE_CLANG_TIDY)
-  find_program(CLANGTIDY clang-tidy)
-  if(CLANGTIDY)
-    set(CMAKE_CXX_CLANG_TIDY ${CLANGTIDY} -extra-arg=-Wno-unknown-warning-option)
-    message("Clang-Tidy finished setting up.")
-  else()
-    message(SEND_ERROR "Clang-Tidy requested but executable not found.")
-  endif()
-endif()
-
-if(${PROJECT_NAME}_ENABLE_CPPCHECK)
-  find_program(CPPCHECK cppcheck)
-  if(CPPCHECK)
-    set(CMAKE_CXX_CPPCHECK ${CPPCHECK} --suppress=missingInclude --enable=all
-                           --inline-suppr --inconclusive)
-    message("Cppcheck finished setting up.")
-  else()
-    message(SEND_ERROR "Cppcheck requested but executable not found.")
-  endif()
-endif()

cmake/Vcpkg.cmake

@@ -1,17 +0,0 @@
-if(NOT DEFINED CMAKE_TOOLCHAIN_FILE)
-    if(NOT EXISTS ${CMAKE_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake)
-        find_package(Git)
-        if(Git_FOUND)
-            execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive vcpkg
-                            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-                            RESULT_VARIABLE GIT_SUBMOD_RESULT)
-            if(NOT GIT_SUBMOD_RESULT EQUAL "0")
-                message(SEND_ERROR "Checking out vcpkg in source tree failed with ${GIT_SUBMOD_RESULT}.")
-            endif()
-        else()
-            message(FATAL_ERROR "Could not find git or vcpkg.cmake. Please either, install git and re-run cmake (or run `git submodule update --init --recursive`), or install vcpkg and add `-DCMAKE_TOOLCHAIN_FILE=<path-to-vcpkg>/scripts/buildsystems/vcpkg.cmake` to your cmake invocation. Please try again after making those changes.")
-        endif()
-    endif()
-    set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake)
-endif()
-

deps/CMakeLists.txt

@@ -0,0 +1,9 @@
+include_directories("${PROJECT_SOURCE_DIR}/deps/asio/asio/include")
+include_directories("${PROJECT_SOURCE_DIR}/deps/rapidjson/include")
+include_directories("${PROJECT_SOURCE_DIR}/deps/websocketpp")
+include_directories("${PROJECT_SOURCE_DIR}/deps/commandline")
+include_directories("${PROJECT_SOURCE_DIR}/deps/sol2/include")
+include_directories("${PROJECT_SOURCE_DIR}/deps")
+
+add_subdirectory("${PROJECT_SOURCE_DIR}/deps/commandline")
+add_subdirectory("${PROJECT_SOURCE_DIR}/deps/sol2")

include/BoostAliases.h

@@ -1,6 +0,0 @@
-#pragma once
-
-#include <boost/asio.hpp>
-#include <boost/system/error_code.hpp>
-
-using namespace boost::asio;

include/Client.h

@@ -0,0 +1,108 @@
+#pragma once
+
+#include <chrono>
+#include <memory>
+#include <optional>
+#include <queue>
+#include <string>
+#include <unordered_set>
+
+#include "Common.h"
+#include "Compat.h"
+#include "VehicleData.h"
+
+class TServer;
+
+#ifdef BEAMMP_WINDOWS
+// for socklen_t
+#include <WS2tcpip.h>
+#endif // WINDOWS
+
+struct TConnection final {
+    SOCKET Socket;
+    struct sockaddr SockAddr;
+    socklen_t SockAddrLen;
+};
+
+class TClient final {
+public:
+    using TSetOfVehicleData = std::vector<TVehicleData>;
+
+    struct TVehicleDataLockPair {
+        TSetOfVehicleData* VehicleData;
+        std::unique_lock<std::mutex> Lock;
+    };
+
+    explicit TClient(TServer& Server);
+    TClient(const TClient&) = delete;
+    TClient& operator=(const TClient&) = delete;
+
+    void AddNewCar(int Ident, const std::string& Data);
+    void SetCarData(int Ident, const std::string& Data);
+    TVehicleDataLockPair GetAllCars();
+    void SetName(const std::string& Name) { mName = Name; }
+    void SetRoles(const std::string& Role) { mRole = Role; }
+    void SetIdentifier(const std::string& key, const std::string& value) { mIdentifiers[key] = value; }
+    std::string GetCarData(int Ident);
+    void SetUDPAddr(sockaddr_in Addr) { mUDPAddress = Addr; }
+    void SetDownSock(SOCKET CSock) { mSocket[1] = CSock; }
+    void SetTCPSock(SOCKET CSock) { mSocket[0] = CSock; }
+    void SetStatus(int Status) { mStatus = Status; }
+    // locks
+    void DeleteCar(int Ident);
+    [[nodiscard]] const std::unordered_map<std::string, std::string>& GetIdentifiers() const { return mIdentifiers; }
+    [[nodiscard]] sockaddr_in GetUDPAddr() const { return mUDPAddress; }
+    [[nodiscard]] SOCKET GetDownSock() const { return mSocket[1]; }
+    [[nodiscard]] SOCKET GetTCPSock() const { return mSocket[0]; }
+    [[nodiscard]] std::string GetRoles() const { return mRole; }
+    [[nodiscard]] std::string GetName() const { return mName; }
+    void SetUnicycleID(int ID) { mUnicycleID = ID; }
+    void SetID(int ID) { mID = ID; }
+    [[nodiscard]] int GetOpenCarID() const;
+    [[nodiscard]] int GetCarCount() const;
+    void ClearCars();
+    [[nodiscard]] int GetStatus() const { return mStatus; }
+    [[nodiscard]] int GetID() const { return mID; }
+    [[nodiscard]] int GetUnicycleID() const { return mUnicycleID; }
+    [[nodiscard]] bool IsConnected() const { return mIsConnected; }
+    [[nodiscard]] bool IsSynced() const { return mIsSynced; }
+    [[nodiscard]] bool IsSyncing() const { return mIsSyncing; }
+    [[nodiscard]] bool IsGuest() const { return mIsGuest; }
+    void SetIsGuest(bool NewIsGuest) { mIsGuest = NewIsGuest; }
+    void SetIsSynced(bool NewIsSynced) { mIsSynced = NewIsSynced; }
+    void SetIsSyncing(bool NewIsSyncing) { mIsSyncing = NewIsSyncing; }
+    void EnqueuePacket(const std::string& Packet);
+    [[nodiscard]] std::queue<std::string>& MissedPacketQueue() { return mPacketsSync; }
+    [[nodiscard]] const std::queue<std::string>& MissedPacketQueue() const { return mPacketsSync; }
+    [[nodiscard]] size_t MissedPacketQueueSize() const { return mPacketsSync.size(); }
+    [[nodiscard]] std::mutex& MissedPacketQueueMutex() const { return mMissedPacketsMutex; }
+    void SetIsConnected(bool NewIsConnected) { mIsConnected = NewIsConnected; }
+    [[nodiscard]] TServer& Server() const;
+    void UpdatePingTime();
+    int SecondsSinceLastPing();
+
+private:
+    void InsertVehicle(int ID, const std::string& Data);
+
+    TServer& mServer;
+    bool mIsConnected = false;
+    bool mIsSynced = false;
+    bool mIsSyncing = false;
+    mutable std::mutex mMissedPacketsMutex;
+    std::queue<std::string> mPacketsSync;
+    std::unordered_map<std::string, std::string> mIdentifiers;
+    bool mIsGuest = false;
+    mutable std::mutex mVehicleDataMutex;
+    TSetOfVehicleData mVehicleData;
+    std::string mName = "Unknown Client";
+    SOCKET mSocket[2] { SOCKET(0), SOCKET(0) };
+    sockaddr_in mUDPAddress {}; // is this initialization OK? yes it is
+    int mUnicycleID = -1;
+    std::string mRole;
+    std::string mDID;
+    int mStatus = 0;
+    int mID = -1;
+    std::chrono::time_point<std::chrono::high_resolution_clock> mLastPingTime;
+};
+
+std::optional<std::weak_ptr<TClient>> GetClient(class TServer& Server, int ID);

include/Common.h

@@ -1,22 +1,20 @@
 #pragma once
 
+#include "TSentry.h"
+extern TSentry Sentry;
+
 #include <array>
 #include <atomic>
 #include <cstring>
 #include <deque>
 #include <filesystem>
-#include <fmt/format.h>
 #include <functional>
 #include <memory>
 #include <mutex>
-#include <shared_mutex>
 #include <sstream>
-#include <unordered_map>
 #include <zlib.h>
 
-#include <doctest/doctest.h>
+#include "Compat.h"
-#include <filesystem>
-namespace fs = std::filesystem;
 
 #include "TConsole.h"
 
@@ -29,9 +27,6 @@ struct Version {
     std::string AsString();
 };
 
-template <typename T>
-using SparseArray = std::unordered_map<size_t, T>;
-
 // 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
@@ -43,11 +38,9 @@ public:
     struct TSettings {
         std::string ServerName { "BeamMP Server" };
         std::string ServerDesc { "BeamMP Default Description" };
-        std::string ServerTags { "Freeroam" };
         std::string Resource { "Resources" };
         std::string MapName { "/levels/gridmap_v2/info.json" };
         std::string Key {};
-        std::string Password{};
         std::string SSLKeyPath { "./.ssl/HttpServer/key.pem" };
         std::string SSLCertPath { "./.ssl/HttpServer/cert.pem" };
         bool HTTPServerEnabled { false };
@@ -57,7 +50,6 @@ public:
         bool DebugModeEnabled { false };
         int Port { 30814 };
         std::string CustomIP {};
-        bool LogChat { true };
         bool SendErrors { true };
         bool SendErrorsMessageEnabled { true };
         int HTTPServerPort { 8080 };
@@ -76,10 +68,10 @@ public:
     static void RegisterShutdownHandler(const TShutdownHandler& Handler);
     // Causes all threads to finish up and exit gracefull gracefully
     static void GracefullyShutdown();
-    static TConsole& Console() { return mConsole; }
+    static TConsole& Console() { return *mConsole; }
     static std::string ServerVersionString();
     static const Version& ServerVersion() { return mVersion; }
-    static uint8_t ClientMajorVersion() { return 2; }
+    static std::string ClientVersionString() { return "2.0"; }
     static std::string PPS() { return mPPS; }
     static void SetPPS(const std::string& NewPPS) { mPPS = NewPPS; }
 
@@ -98,11 +90,11 @@ public:
     static void CheckForUpdates();
     static std::array<uint8_t, 3> VersionStrToInts(const std::string& str);
     static bool IsOutdated(const Version& Current, const Version& Newest);
-    static bool IsShuttingDown();
-    static void SleepSafeSeconds(size_t Seconds);
 
     static void InitializeConsole() {
-        mConsole.InitializeCommandline();
+        if (!mConsole) {
+            mConsole = std::make_unique<TConsole>();
+        }
     }
 
     enum class Status {
@@ -123,147 +115,155 @@ public:
     static void SetSubsystemStatus(const std::string& Subsystem, Status status);
 
 private:
-    static void SetShutdown(bool Val);
-
     static inline SystemStatusMap mSystemStatusMap {};
     static inline std::mutex mSystemStatusMapMutex {};
     static inline std::string mPPS;
-    static inline TConsole mConsole;
+    static inline std::unique_ptr<TConsole> mConsole;
-    static inline std::shared_mutex mShutdownMtx {};
-    static inline bool mShutdown { false };
     static inline std::mutex mShutdownHandlersMutex {};
     static inline std::deque<TShutdownHandler> mShutdownHandlers {};
 
-    static inline Version mVersion { 3, 2, 2 };
+    static inline Version mVersion { 3, 0, 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__)
 
-#define KB 1024llu
+#define KB 1024
-#define MB (KB * 1024llu)
+#define MB (KB * 1024)
-#define GB (MB * 1024llu)
 #define SSU_UNRAW SECRET_SENTRY_URL
 
 #define _file_basename std::filesystem::path(__FILE__).filename().string()
 #define _line std::to_string(__LINE__)
 #define _in_lambda (std::string(__func__) == "operator()")
 
+// we would like the full function signature 'void a::foo() const'
+// on windows this is __FUNCSIG__, on GCC it's __PRETTY_FUNCTION__,
+// feel free to add more
+#if defined(WIN32)
+#define _function_name std::string(__FUNCSIG__)
+#elif defined(__unix) || defined(__unix__)
+#define _function_name std::string(__PRETTY_FUNCTION__)
+#else
+#define _function_name std::string(__func__)
+#endif
+
+#if defined(DEBUG)
+
+// if this is defined, we will show the full function signature infront of
+// each info/debug/warn... call instead of the 'filename:line' format.
+#if defined(BMP_FULL_FUNCTION_NAMES)
+#define _this_location (ThreadName() + _function_name + " ")
+#else
+#define _this_location (ThreadName() + _file_basename + ":" + _line + " ")
+#endif
+#define SU_RAW SSU_UNRAW
+
+#else // !defined(DEBUG)
+
+#define SU_RAW RAWIFY(SSU_UNRAW)
+#define _this_location (ThreadName())
+
+#endif // defined(DEBUG)
+
+#define beammp_warn(x) Application::Console().Write(_this_location + std::string("[WARN] ") + (x))
+#define beammp_info(x) Application::Console().Write(_this_location + std::string("[INFO] ") + (x))
+#define beammp_error(x)                                                               \
+    do {                                                                              \
+        Application::Console().Write(_this_location + std::string("[ERROR] ") + (x)); \
+        Sentry.AddErrorBreadcrumb((x), _file_basename, _line);                        \
+    } while (false)
+#define beammp_lua_error(x)                                                               \
+    do {                                                                                  \
+        Application::Console().Write(_this_location + std::string("[LUA ERROR] ") + (x)); \
+    } while (false)
+#define beammp_lua_warn(x)                                                               \
+    do {                                                                                 \
+        Application::Console().Write(_this_location + std::string("[LUA WARN] ") + (x)); \
+    } while (false)
+#define luaprint(x) Application::Console().Write(_this_location + std::string("[LUA] ") + (x))
+#define beammp_debug(x)                                                                   \
+    do {                                                                                  \
+        if (Application::Settings.DebugModeEnabled) {                                     \
+            Application::Console().Write(_this_location + std::string("[DEBUG] ") + (x)); \
+        }                                                                                 \
+    } while (false)
+#define beammp_event(x)                                                                   \
+    do {                                                                                  \
+        if (Application::Settings.DebugModeEnabled) {                                     \
+            Application::Console().Write(_this_location + std::string("[EVENT] ") + (x)); \
+        }                                                                                 \
+    } while (false)
 // for those times when you just need to ignore something :^)
 // explicity disables a [[nodiscard]] warning
 #define beammp_ignore(x) (void)x
-
+// trace() is a debug-build debug()
-// clang-format off
-#ifdef DOCTEST_CONFIG_DISABLE
-
-    // we would like the full function signature 'void a::foo() const'
-    // on windows this is __FUNCSIG__, on GCC it's __PRETTY_FUNCTION__,
-    // feel free to add more
-    #if defined(WIN32)
-        #define _function_name std::string(__FUNCSIG__)
-    #elif defined(__unix) || defined(__unix__)
-        #define _function_name std::string(__PRETTY_FUNCTION__)
-    #else
-        #define _function_name std::string(__func__)
-    #endif
-    
-    #ifndef NDEBUG
-        #define DEBUG
-    #endif
-    
-    #if defined(DEBUG)
-        
-        // if this is defined, we will show the full function signature infront of
-        // each info/debug/warn... call instead of the 'filename:line' format.
-        #if defined(BMP_FULL_FUNCTION_NAMES)
-            #define _this_location (ThreadName() + _function_name + " ")
-        #else
-            #define _this_location (ThreadName() + _file_basename + ":" + _line + " ")
-        #endif
-
-    #endif // defined(DEBUG)
-    
-    #define beammp_warn(x) Application::Console().Write(_this_location + std::string("[WARN] ") + (x))
-    #define beammp_info(x) Application::Console().Write(_this_location + std::string("[INFO] ") + (x))
-    #define beammp_error(x)                                                               \
-        do {                                                                              \
-            Application::Console().Write(_this_location + std::string("[ERROR] ") + (x)); \
-        } while (false)
-    #define beammp_lua_error(x)                                                               \
-        do {                                                                                  \
-            Application::Console().Write(_this_location + std::string("[LUA ERROR] ") + (x)); \
-        } while (false)
-    #define beammp_lua_warn(x)                                                               \
-        do {                                                                                 \
-            Application::Console().Write(_this_location + std::string("[LUA WARN] ") + (x)); \
-        } while (false)
-    #define luaprint(x) Application::Console().Write(_this_location + std::string("[LUA] ") + (x))
-    #define beammp_debug(x)                                                                   \
-        do {                                                                                  \
-            if (Application::Settings.DebugModeEnabled) {                                     \
-                Application::Console().Write(_this_location + std::string("[DEBUG] ") + (x)); \
-            }                                                                                 \
-        } while (false)
-    #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 {                                                                                  \
-                if (Application::Settings.DebugModeEnabled) {                                     \
-                    Application::Console().Write(_this_location + std::string("[TRACE] ") + (x)); \
-                }                                                                                 \
-            } while (false)
-    #else
-        #define beammp_trace(x)
-    #endif // defined(DEBUG)
-    
-    #define beammp_errorf(...) beammp_error(fmt::format(__VA_ARGS__))
-    #define beammp_infof(...) beammp_info(fmt::format(__VA_ARGS__))
-    #define beammp_debugf(...) beammp_debug(fmt::format(__VA_ARGS__))
-    #define beammp_warnf(...) beammp_warn(fmt::format(__VA_ARGS__))
-    #define beammp_tracef(...) beammp_trace(fmt::format(__VA_ARGS__))
-    #define beammp_lua_errorf(...) beammp_lua_error(fmt::format(__VA_ARGS__))
-    #define beammp_lua_warnf(...) beammp_lua_warn(fmt::format(__VA_ARGS__))
-
-#else // DOCTEST_CONFIG_DISABLE
-
-    #define beammp_error(x) /* x */
-    #define beammp_lua_error(x) /* x */
-    #define beammp_warn(x) /* x */
-    #define beammp_lua_warn(x) /* x */
-    #define beammp_info(x) /* x */
-    #define beammp_event(x) /* x */
-    #define beammp_debug(x) /* x */
-    #define beammp_trace(x) /* x */
-    #define luaprint(x) /* x */
-    #define beammp_errorf(...) beammp_error(fmt::format(__VA_ARGS__))
-    #define beammp_infof(...) beammp_info(fmt::format(__VA_ARGS__))
-    #define beammp_warnf(...) beammp_warn(fmt::format(__VA_ARGS__))
-    #define beammp_debugf(...) beammp_debug(fmt::format(__VA_ARGS__))
-    #define beammp_tracef(...) beammp_trace(fmt::format(__VA_ARGS__))
-    #define beammp_lua_errorf(...) beammp_lua_error(fmt::format(__VA_ARGS__))
-    #define beammp_lua_warnf(...) beammp_lua_warn(fmt::format(__VA_ARGS__))
-
-#endif // DOCTEST_CONFIG_DISABLE
-
 #if defined(DEBUG)
-    #define SU_RAW SSU_UNRAW
+#define beammp_trace(x)                                                                   \
+    do {                                                                                  \
+        if (Application::Settings.DebugModeEnabled) {                                     \
+            Application::Console().Write(_this_location + std::string("[TRACE] ") + (x)); \
+        }                                                                                 \
+    } while (false)
 #else
-    #define SU_RAW RAWIFY(SSU_UNRAW)
+#define beammp_trace(x)
-    #define _this_location (ThreadName())
+#endif // defined(DEBUG)
-#endif
-
-// clang-format on
 
 void LogChatMessage(const std::string& name, int id, const std::string& msg);
 
+#define Biggest 30000
+
+template <typename T>
+inline T Comp(const T& Data) {
+    std::array<char, Biggest> C {};
+    // obsolete
+    C.fill(0);
+    z_stream defstream;
+    defstream.zalloc = Z_NULL;
+    defstream.zfree = Z_NULL;
+    defstream.opaque = Z_NULL;
+    defstream.avail_in = (uInt)Data.size();
+    defstream.next_in = (Bytef*)&Data[0];
+    defstream.avail_out = Biggest;
+    defstream.next_out = reinterpret_cast<Bytef*>(C.data());
+    deflateInit(&defstream, Z_BEST_COMPRESSION);
+    deflate(&defstream, Z_SYNC_FLUSH);
+    deflate(&defstream, Z_FINISH);
+    deflateEnd(&defstream);
+    size_t TotalOut = defstream.total_out;
+    T Ret;
+    Ret.resize(TotalOut);
+    std::fill(Ret.begin(), Ret.end(), 0);
+    std::copy_n(C.begin(), TotalOut, Ret.begin());
+    return Ret;
+}
+
+template <typename T>
+inline T DeComp(const T& Compressed) {
+    std::array<char, Biggest> C {};
+    // not needed
+    C.fill(0);
+    z_stream infstream;
+    infstream.zalloc = Z_NULL;
+    infstream.zfree = Z_NULL;
+    infstream.opaque = Z_NULL;
+    infstream.avail_in = Biggest;
+    infstream.next_in = (Bytef*)(&Compressed[0]);
+    infstream.avail_out = Biggest;
+    infstream.next_out = (Bytef*)(C.data());
+    inflateInit(&infstream);
+    inflate(&infstream, Z_SYNC_FLUSH);
+    inflate(&infstream, Z_FINISH);
+    inflateEnd(&infstream);
+    size_t TotalOut = infstream.total_out;
+    T Ret;
+    Ret.resize(TotalOut);
+    std::fill(Ret.begin(), Ret.end(), 0);
+    std::copy_n(C.begin(), TotalOut, Ret.begin());
+    return Ret;
+}
+
 std::string GetPlatformAgnosticErrorString();
 #define S_DSN SU_RAW
+
+void LogChatMessage(const std::string& name, int id, const std::string& msg);

include/Compat.h

@@ -5,23 +5,49 @@
 // ======================= UNIX ========================
 
 #ifdef BEAMMP_LINUX
-#include <errno.h>
+#include <arpa/inet.h>
+#include <sys/socket.h>
 #include <termios.h>
 #include <unistd.h>
+#include <errno.h>
+using SOCKET = int;
+using DWORD = unsigned long;
+using PDWORD = unsigned long*;
+using LPDWORD = unsigned long*;
 char _getch();
+inline void CloseSocketProper(int TheSocket) {
+    shutdown(TheSocket, SHUT_RDWR);
+    close(TheSocket);
+}
 #endif // unix
 
 // ======================= APPLE ========================
 
 #ifdef BEAMMP_APPLE
-#include <errno.h>
+#include <arpa/inet.h>
+#include <sys/socket.h>
 #include <termios.h>
 #include <unistd.h>
+#include <errno.h>
+using SOCKET = int;
+using DWORD = unsigned long;
+using PDWORD = unsigned long*;
+using LPDWORD = unsigned long*;
 char _getch();
+inline void CloseSocketProper(int TheSocket) {
+    shutdown(TheSocket, SHUT_RDWR);
+    close(TheSocket);
+}
 #endif // unix
 
 // ======================= WINDOWS =======================
 
 #ifdef BEAMMP_WINDOWS
 #include <conio.h>
+#include <winsock2.h>
+inline void CloseSocketProper(SOCKET TheSocket) {
+    shutdown(TheSocket, 2); // 2 == SD_BOTH
+    closesocket(TheSocket);
+
+}
 #endif // WIN32

include/CustomAssert.h

@@ -58,15 +58,16 @@ inline void _assert([[maybe_unused]] const char* file, [[maybe_unused]] const ch
 #define beammp_assert(cond) _assert(__FILE__, __func__, __LINE__, #cond, (cond))
 #define beammp_assert_not_reachable() _assert(__FILE__, __func__, __LINE__, "reached unreachable code", false)
 #else
-#define beammp_assert(cond)                                                            \
+// In release build, these macros turn into NOPs. The compiler will optimize these out.
-    do {                                                                               \
+#define beammp_assert(cond)                                           \
-        bool result = (cond);                                                          \
+    do {                                                              \
-        if (!result) {                                                                 \
+        bool result = (cond);                                         \
-            beammp_errorf("Assertion failed in '{}:{}': {}.", __func__, _line, #cond); \
+        if (!result) {                                                \
-        }                                                                              \
+            Sentry.LogAssert(#cond, _file_basename, _line, __func__); \
+        }                                                             \
     } while (false)
-#define beammp_assert_not_reachable()                                                      \
+#define beammp_assert_not_reachable()                                             \
-    do {                                                                                   \
+    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

include/Env.h

@@ -1,16 +0,0 @@
-#pragma once
-
-#include <optional>
-#include <string>
-namespace Env {
-
-enum class Key {
-    // provider settings
-    PROVIDER_UPDATE_MESSAGE,
-};
-
-std::optional<std::string> Get(Key key);
-
-std::string_view ToString(Key key);
-
-}

include/Http.h

@@ -3,14 +3,14 @@
 #include <Common.h>
 #include <IThreaded.h>
 #include <filesystem>
+#include <openssl/pem.h>
+#include <openssl/x509.h>
 #include <string>
 #include <unordered_map>
 
 #if defined(BEAMMP_LINUX)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#pragma GCC diagnostic ignored "-Wcast-qual"
-#pragma GCC diagnostic ignored "-Wold-style-cast"
 #endif
 #include <httplib.h>
 #if defined(BEAMMP_LINUX)
@@ -19,6 +19,10 @@
 
 namespace fs = std::filesystem;
 
+namespace Crypto {
+constexpr size_t RSA_DEFAULT_KEYLENGTH { 2048 };
+}
+
 namespace Http {
 std::string GET(const std::string& host, int port, const std::string& target, unsigned int* status = nullptr);
 std::string POST(const std::string& host, int port, const std::string& target, const std::string& body, const std::string& ContentType, unsigned int* status = nullptr, const httplib::Headers& headers = {});
@@ -28,9 +32,13 @@ namespace Status {
 const std::string ErrorString = "-1";
 
 namespace Server {
+    void SetupEnvironment();
+    // todo: Add non TLS Server Instance, this one is TLS only
     class THttpServerInstance {
     public:
         THttpServerInstance();
+        static fs::path KeyFilePath;
+        static fs::path CertFilePath;
 
     protected:
         void operator()();
@@ -38,5 +46,15 @@ namespace Server {
     private:
         std::thread mThread;
     };
+    // todo: all of these functions are likely unsafe,
+    // todo: replace with something that's managed by a domain specific crypto library
+    class Tx509KeypairGenerator {
+    public:
+        static long GenerateRandomId();
+        static bool EnsureTLSConfigExists();
+        static X509* GenerateCertificate(EVP_PKEY& pkey);
+        static EVP_PKEY* GenerateKey();
+        static void GenerateAndWriteToDisk(const fs::path& KeyFilePath, const fs::path& CertFilePath);
+    };
 }
 }

include/IThreaded.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <boost/thread/scoped_thread.hpp>
 #include <thread>
 
 // pure virtual class to be inherited from by classes which intend to be threaded
@@ -9,15 +8,17 @@ public:
     IThreaded()
         // invokes operator() on this object
         : mThread() { }
-    virtual ~IThreaded() noexcept {
+    ~IThreaded() noexcept {
-        mThread.interrupt();
+        if (mThread.joinable()) {
+            mThread.join();
+        }
     }
 
     virtual void Start() final {
-        mThread = boost::scoped_thread<>([this] { (*this)(); });
+        mThread = std::thread([this] { (*this)(); });
     }
     virtual void operator()() = 0;
 
 protected:
-    boost::scoped_thread<> mThread {};
+    std::thread mThread;
 };

include/LuaAPI.h

@@ -12,26 +12,17 @@ namespace MP {
 
     std::string GetOSName();
     std::tuple<int, int, int> GetServerVersion();
-    std::pair<bool, std::string> TriggerClientEvent(int PlayerID, const std::string& EventName, const sol::object& Data);
+    bool TriggerClientEvent(int PlayerID, const std::string& EventName, const std::string& Data);
-    std::pair<bool, std::string> TriggerClientEventJson(int PlayerID, const std::string& EventName, const sol::table& Data);
+    inline size_t GetPlayerCount() { return Engine->Server().ClientCount(); }
-    inline size_t GetPlayerCount() { return Engine->Network()->authenticated_client_count(); }
+    void DropPlayer(int ID, std::optional<std::string> MaybeReason);
-    std::pair<bool, std::string> DropPlayer(int ID, std::optional<std::string> MaybeReason);
+    void SendChatMessage(int ID, const std::string& Message);
-    std::pair<bool, std::string> SendChatMessage(int ID, const std::string& Message);
+    void RemoveVehicle(int PlayerID, int VehicleID);
-    std::pair<bool, std::string> RemoveVehicle(int PlayerID, int VehicleID);
     void Set(int ConfigID, sol::object NewValue);
     bool IsPlayerGuest(int ID);
     bool IsPlayerConnected(int ID);
     void Sleep(size_t Ms);
     void PrintRaw(sol::variadic_args);
-    std::string JsonEncode(const sol::table& object);
-    std::string JsonDiff(const std::string& a, const std::string& b);
-    std::string JsonDiffApply(const std::string& data, const std::string& patch);
-    std::string JsonPrettify(const std::string& json);
-    std::string JsonMinify(const std::string& json);
-    std::string JsonFlatten(const std::string& json);
-    std::string JsonUnflatten(const std::string& json);
 }
-
 namespace FS {
     std::pair<bool, std::string> CreateDirectory(const std::string& Path);
     std::pair<bool, std::string> Remove(const std::string& Path);

include/Network.h

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

include/Sync.h

@@ -1,10 +0,0 @@
-#pragma once
-
-#include <boost/thread/synchronized_value.hpp>
-#include <mutex>
-
-/// This header provides convenience aliases for synchronization primitives.
-
-template<typename T>
-using Sync = boost::synchronized_value<T, std::recursive_mutex>;
-

include/TConfig.h

@@ -3,10 +3,9 @@
 #include "Common.h"
 
 #include <atomic>
-#include <filesystem>
 
 #define TOML11_PRESERVE_COMMENTS_BY_DEFAULT
-#include <toml.hpp> // header-only version of TOML++
+#include <toml11/toml.hpp> // header-only version of TOML++
 
 namespace fs = std::filesystem;
 
@@ -19,15 +18,14 @@ public:
     void FlushToFile();
 
 private:
-    void CreateConfigFile();
+    void CreateConfigFile(std::string_view name);
     void ParseFromFile(std::string_view name);
     void PrintDebug();
-    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, std::string& OutValue);
+    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, 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, bool& OutValue);
-    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, int& OutValue);
+    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, int& OutValue);
 
     void ParseOldFormat();
-    std::string TagsAsPrettyArray() const;
     bool IsDefault();
     bool mFailed { false };
     std::string mConfigFileName;

include/TConsole.h

@@ -1,40 +1,9 @@
 #pragma once
 
 #include "Cryptography.h"
-#include "TScopedTimer.h"
 #include "commandline.h"
 #include <atomic>
 #include <fstream>
-#include <functional>
-#include <mutex>
-#include <string>
-#include <tuple>
-#include <unordered_map>
-#include <vector>
-#include <boost/container/deque.hpp>
-#include <boost/thread/scoped_thread.hpp>
-#include <boost/thread/synchronized_value.hpp>
-#include <memory>
-#include <optional>
-#include <span>
-#include <spdlog/details/null_mutex.h>
-#include <spdlog/sinks/base_sink.h>
-#include <spdlog/sinks/sink.h>
-#include <string>
-#include <string_view>
-
-class TConsole;
-
-class ConsoleSink : public spdlog::sinks::base_sink<spdlog::details::null_mutex> {
-public:
-    ConsoleSink(TConsole& console);
-
-private:
-    void sink_it_(const spdlog::details::log_msg& msg) override;
-    void flush_() override;
-
-    TConsole* m_console;
-};
 
 class TLuaEngine;
 
@@ -42,49 +11,26 @@ 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);
     void ChangeToLuaConsole(const std::string& LuaStateId);
     void ChangeToRegularConsole();
-    void HandleLuaInternalCommand(const std::string& cmd);
 
-    void Command_Lua(const std::string& cmd, const std::vector<std::string>& args);
+    void Command_Lua(const std::string& cmd);
-    void Command_Help(const std::string& cmd, const std::vector<std::string>& args);
+    void Command_Help(const std::string& cmd);
-    void Command_Kick(const std::string& cmd, const std::vector<std::string>& args);
+    void Command_Kick(const std::string& cmd);
-    void Command_List(const std::string& cmd, const std::vector<std::string>& args);
+    void Command_Say(const std::string& cmd);
-    void Command_Status(const std::string& cmd, const std::vector<std::string>& args);
+    void Command_List(const std::string& cmd);
-    void Command_Settings(const std::string& cmd, const std::vector<std::string>& args);
+    void Command_Status(const std::string& cmd);
-    void Command_Clear(const std::string&, const std::vector<std::string>& args);
 
-    void Command_Say(const std::string& FullCommand);
+    Commandline mCommandline;
-    bool EnsureArgsCount(const std::vector<std::string>& args, size_t n);
-    bool EnsureArgsCount(const std::vector<std::string>& args, size_t min, size_t max);
-
-    static std::tuple<std::string, std::vector<std::string>> ParseCommand(const std::string& cmd);
-    static std::string ConcatArgs(const std::vector<std::string>& args, char space = ' ');
-
-    std::unordered_map<std::string, std::function<void(const std::string&, const std::vector<std::string>&)>> mCommandMap = {
-        { "lua", [this](const auto& a, const auto& b) { Command_Lua(a, b); } },
-        { "help", [this](const auto& a, const auto& b) { Command_Help(a, b); } },
-        { "kick", [this](const auto& a, const auto& b) { Command_Kick(a, b); } },
-        { "list", [this](const auto& a, const auto& b) { Command_List(a, b); } },
-        { "status", [this](const auto& a, const auto& b) { Command_Status(a, b); } },
-        { "settings", [this](const auto& a, const auto& b) { Command_Settings(a, b); } },
-        { "clear", [this](const auto& a, const auto& b) { Command_Clear(a, b); } },
-        { "say", [this](const auto&, const auto&) { Command_Say(""); } }, // shouldn't actually be called
-    };
-
-    std::unique_ptr<Commandline> mCommandline { nullptr };
     std::vector<std::string> mCachedLuaHistory;
     std::vector<std::string> mCachedRegularHistory;
     TLuaEngine* mLuaEngine { nullptr };
@@ -94,5 +40,4 @@ private:
     const std::string mDefaultStateId = "BEAMMP_SERVER_CONSOLE";
     std::ofstream mLogFileStream;
     std::mutex mLogFileStreamMtx;
-    TScopedTimer mUptimeTimer{};
 };

include/THeartbeatThread.h

@@ -2,11 +2,12 @@
 
 #include "Common.h"
 #include "IThreaded.h"
-#include "Network.h"
+#include "TResourceManager.h"
+#include "TServer.h"
 
 class THeartbeatThread : public IThreaded {
 public:
-    THeartbeatThread(std::shared_ptr<Network> network);
+    THeartbeatThread(TResourceManager& ResourceManager, TServer& Server);
     //~THeartbeatThread();
     void operator()() override;
 
@@ -14,5 +15,7 @@ private:
     std::string GenerateCall();
     std::string GetPlayers();
 
-    std::shared_ptr<Network> m_network;
+    bool mShutdown = false;
+    TResourceManager& mResourceManager;
+    TServer& mServer;
 };

include/TLuaEngine.h

@@ -1,10 +1,8 @@
 #pragma once
 
-#include "Common.h"
+#include "TNetwork.h"
-#include "IThreaded.h"
+#include "TServer.h"
-#include "Network.h"
 #include <any>
-#include <boost/thread/scoped_thread.hpp>
 #include <condition_variable>
 #include <filesystem>
 #include <initializer_list>
@@ -13,9 +11,8 @@
 #include <memory>
 #include <mutex>
 #include <queue>
-#include <random>
 #include <set>
-#include <toml.hpp>
+#include <toml11/toml.hpp>
 #include <unordered_map>
 #include <vector>
 
@@ -27,30 +24,22 @@ namespace fs = std::filesystem;
 /**
  * std::variant means, that TLuaArgTypes may be one of the Types listed as template args
  */
-using TLuaArgTypes = std::variant<std::string, int, sol::variadic_args, bool, std::unordered_map<std::string, std::string>>;
+using TLuaArgTypes = std::variant<std::string, int, sol::variadic_args, bool>;
 static constexpr size_t TLuaArgTypes_String = 0;
 static constexpr size_t TLuaArgTypes_Int = 1;
 static constexpr size_t TLuaArgTypes_VariadicArgs = 2;
 static constexpr size_t TLuaArgTypes_Bool = 3;
-static constexpr size_t TLuaArgTypes_StringStringMap = 4;
 
 class TLuaPlugin;
 
 struct TLuaResult {
-    bool Ready;
+    std::atomic_bool Ready;
-    bool Error;
+    std::atomic_bool Error;
     std::string ErrorMessage;
     sol::object Result { sol::lua_nil };
     TLuaStateId StateId;
     std::string Function;
-    std::shared_ptr<std::mutex> ReadyMutex {
+    // TODO: Add condition_variable
-        std::make_shared<std::mutex>()
-    };
-    std::shared_ptr<std::condition_variable> ReadyCondition {
-        std::make_shared<std::condition_variable>()
-    };
-
-    void MarkAsReady();
     void WaitUntilReady();
 };
 
@@ -58,7 +47,6 @@ struct TLuaPluginConfig {
     static inline const std::string FileName = "PluginConfig.toml";
     TLuaStateId StateId;
     // TODO: Add execute list
-    // TODO: Build a better toml serializer, or some way to do this in an easier way
 };
 
 struct TLuaChunk {
@@ -70,7 +58,20 @@ struct TLuaChunk {
     std::string PluginPath;
 };
 
-class TLuaEngine : public std::enable_shared_from_this<TLuaEngine> {
+class TPluginMonitor : IThreaded {
+public:
+    TPluginMonitor(const fs::path& Path, TLuaEngine& Engine, std::atomic_bool& Shutdown);
+
+    void operator()();
+
+private:
+    TLuaEngine& mEngine;
+    fs::path mPath;
+    std::atomic_bool& mShutdown;
+    std::unordered_map<std::string, fs::file_time_type> mFileTimes;
+};
+
+class TLuaEngine : IThreaded {
 public:
     enum CallStrategy : int {
         BestEffort,
@@ -85,32 +86,26 @@ public:
     };
 
     TLuaEngine();
-    virtual ~TLuaEngine() noexcept {
+    ~TLuaEngine() noexcept {
         beammp_debug("Lua Engine terminated");
     }
 
-    void Start();
+    void operator()() override;
 
-    std::shared_ptr<::Network> Network() { return mNetwork; }
+    TNetwork& Network() { return *mNetwork; }
+    TServer& Server() { return *mServer; }
 
-    void SetNetwork(const std::shared_ptr<::Network>& network) { mNetwork = network; }
+    void SetNetwork(TNetwork* Network) { mNetwork = Network; }
+    void SetServer(TServer* Server) { mServer = Server; }
 
     size_t GetResultsToCheckSize() {
         std::unique_lock Lock(mResultsToCheckMutex);
         return mResultsToCheck.size();
     }
-
     size_t GetLuaStateCount() {
         std::unique_lock Lock(mLuaStatesMutex);
         return mLuaStates.size();
     }
-    std::vector<std::string> GetLuaStateNames() {
-        std::vector<std::string> names {};
-        for (auto const& [stateId, _] : mLuaStates) {
-            names.push_back(stateId);
-        }
-        return names;
-    }
     size_t GetTimedEventsCount() {
         std::unique_lock Lock(mTimedEventsMutex);
         return mTimedEvents.size();
@@ -134,6 +129,7 @@ public:
     [[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);
+    template <typename... ArgsT>
     /**
      *
      * @tparam ArgsT Template Arguments for the event (Metadata) todo: figure out what this means
@@ -142,7 +138,6 @@ public:
      * @param Args
      * @return
      */
-    template <typename... ArgsT>
     [[nodiscard]] std::vector<std::shared_ptr<TLuaResult>> TriggerEvent(const std::string& EventName, TLuaStateId IgnoreId, ArgsT&&... Args) {
         std::unique_lock Lock(mLuaEventsMutex);
         beammp_event(EventName);
@@ -162,21 +157,6 @@ public:
         }
         return Results; //
     }
-    template <typename... ArgsT>
-    [[nodiscard]] std::vector<std::shared_ptr<TLuaResult>> TriggerLocalEvent(const TLuaStateId& StateId, const std::string& EventName, ArgsT&&... Args) {
-        std::unique_lock Lock(mLuaEventsMutex);
-        beammp_event(EventName + " in '" + StateId + "'");
-        if (mLuaEvents.find(EventName) == mLuaEvents.end()) { // if no event handler is defined for 'EventName', return immediately
-            return {};
-        }
-        std::vector<std::shared_ptr<TLuaResult>> Results;
-        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));
-        }
-        return Results;
-    }
     std::set<std::string> GetEventHandlersForState(const std::string& EventName, TLuaStateId StateId);
     void CreateEventTimer(const std::string& EventName, TLuaStateId StateId, size_t IntervalMS, CallStrategy Strategy);
     void CancelEventTimers(const std::string& EventName, TLuaStateId StateId);
@@ -186,43 +166,25 @@ public:
 
     static constexpr const char* BeamMPFnNotFoundError = "BEAMMP_FN_NOT_FOUND";
 
-    std::vector<std::string> GetStateGlobalKeysForState(TLuaStateId StateId);
-    std::vector<std::string> GetStateTableKeysForState(TLuaStateId StateId, std::vector<std::string> keys);
-
-    // Debugging functions (slow)
-    std::unordered_map<std::string /*event name */, std::vector<std::string> /* handlers */> Debug_GetEventsForState(TLuaStateId StateId);
-    std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> Debug_GetStateExecuteQueueForState(TLuaStateId StateId);
-    std::vector<QueuedFunction> Debug_GetStateFunctionQueueForState(TLuaStateId StateId);
-    std::vector<TLuaResult> Debug_GetResultsToCheckForState(TLuaStateId StateId);
-
 private:
     void CollectAndInitPlugins();
     void InitializePlugin(const fs::path& Folder, const TLuaPluginConfig& Config);
     void FindAndParseConfig(const fs::path& Folder, TLuaPluginConfig& Config);
     size_t CalculateMemoryUsage();
 
-    class StateThreadData {
+    class StateThreadData : IThreaded {
     public:
-        StateThreadData(const std::string& Name, TLuaStateId StateId, TLuaEngine& Engine);
+        StateThreadData(const std::string& Name, std::atomic_bool& Shutdown, TLuaStateId StateId, TLuaEngine& Engine);
         StateThreadData(const StateThreadData&) = delete;
-        virtual ~StateThreadData() noexcept { beammp_debug("\"" + mStateId + "\" destroyed"); }
+        ~StateThreadData() noexcept { beammp_debug("\"" + mStateId + "\" destroyed"); }
         [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueScript(const TLuaChunk& Script);
         [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCall(const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args);
         [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCallFromCustomEvent(const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args, const std::string& EventName, CallStrategy Strategy);
         void RegisterEvent(const std::string& EventName, const std::string& FunctionName);
         void AddPath(const fs::path& Path); // to be added to path and cpath
-        void Start();
+        void operator()() override;
         sol::state_view State() { return sol::state_view(mState); }
 
-        std::vector<std::string> GetStateGlobalKeys();
-        std::vector<std::string> GetStateTableKeys(const std::vector<std::string>& keys);
-
-        // Debug functions, slow
-        std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> Debug_GetStateExecuteQueue();
-        std::vector<TLuaEngine::QueuedFunction> Debug_GetStateFunctionQueue();
-
-        sol::table Lua_JsonDecode(const std::string& str);
-
     private:
         sol::table Lua_TriggerGlobalEvent(const std::string& EventName, sol::variadic_args EventArgs);
         sol::table Lua_TriggerLocalEvent(const std::string& EventName, sol::variadic_args EventArgs);
@@ -230,15 +192,14 @@ private:
         sol::table Lua_GetPlayers();
         std::string Lua_GetPlayerName(int ID);
         sol::table Lua_GetPlayerVehicles(int ID);
-        std::pair<sol::table, std::string> Lua_GetVehicleStatus(int VID);
         sol::table Lua_HttpCreateConnection(const std::string& host, uint16_t port);
         int Lua_GetPlayerIDByName(const std::string& Name);
-        sol::table Lua_FS_ListFiles(const std::string& Path);
-        sol::table Lua_FS_ListDirectories(const std::string& Path);
 
         std::string mName;
+        std::atomic_bool& mShutdown;
         TLuaStateId mStateId;
         lua_State* mState;
+        std::thread mThread;
         std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> mStateExecuteQueue;
         std::recursive_mutex mStateExecuteQueueMutex;
         std::vector<QueuedFunction> mStateFunctionQueue;
@@ -248,9 +209,6 @@ private:
         sol::state_view mStateView { mState };
         std::queue<fs::path> mPaths;
         std::recursive_mutex mPathsMutex;
-        std::mt19937 mMersenneTwister;
-        std::uniform_real_distribution<double> mUniformRealDistribution01;
-        boost::scoped_thread<> mThread;
     };
 
     struct TimedEvent {
@@ -263,8 +221,11 @@ private:
         void Reset();
     };
 
-    std::shared_ptr<::Network> mNetwork;
+    TNetwork* mNetwork;
-    const fs::path mResourceServerPath;
+    TServer* mServer;
+    TPluginMonitor mPluginMonitor;
+    std::atomic_bool mShutdown { false };
+    fs::path mResourceServerPath;
     std::vector<std::shared_ptr<TLuaPlugin>> mLuaPlugins;
     std::unordered_map<TLuaStateId, std::unique_ptr<StateThreadData>> mLuaStates;
     std::recursive_mutex mLuaStatesMutex;
@@ -275,7 +236,6 @@ private:
     std::list<std::shared_ptr<TLuaResult>> mResultsToCheck;
     std::mutex mResultsToCheckMutex;
     std::condition_variable mResultsToCheckCond;
-    boost::scoped_thread<> mThread;
 };
 
 // std::any TriggerLuaEvent(const std::string& Event, bool local, TLuaPlugin* Caller, std::shared_ptr<TLuaArg> arg, bool Wait);

include/TNetwork.h

@@ -0,0 +1,51 @@
+#pragma once
+
+#include "Compat.h"
+#include "TResourceManager.h"
+#include "TServer.h"
+
+struct TConnection;
+
+class TNetwork {
+public:
+    TNetwork(TServer& Server, TPPSMonitor& PPSMonitor, TResourceManager& ResourceManager);
+
+    [[nodiscard]] bool TCPSend(TClient& c, const std::string& Data, bool IsSync = false);
+    [[nodiscard]] bool SendLarge(TClient& c, std::string Data, bool isSync = false);
+    [[nodiscard]] bool Respond(TClient& c, const std::string& MSG, bool Rel, bool isSync = false);
+    std::shared_ptr<TClient> CreateClient(SOCKET TCPSock);
+    std::string TCPRcv(TClient& c);
+    void ClientKick(TClient& c, const std::string& R);
+    [[nodiscard]] bool SyncClient(const std::weak_ptr<TClient>& c);
+    void Identify(const TConnection& client);
+    void Authentication(const TConnection& ClientConnection);
+    [[nodiscard]] bool CheckBytes(TClient& c, int32_t BytesRcv);
+    void SyncResources(TClient& c);
+    [[nodiscard]] bool UDPSend(TClient& Client, std::string Data) const;
+    void SendToAll(TClient* c, const std::string& Data, bool Self, bool Rel);
+    void UpdatePlayer(TClient& Client);
+
+private:
+    void UDPServerMain();
+    void TCPServerMain();
+
+    TServer& mServer;
+    TPPSMonitor& mPPSMonitor;
+    SOCKET mUDPSock {};
+    bool mShutdown { false };
+    TResourceManager& mResourceManager;
+    std::thread mUDPThread;
+    std::thread mTCPThread;
+
+    std::string UDPRcvFromClient(sockaddr_in& client) const;
+    void HandleDownload(SOCKET TCPSock);
+    void OnConnect(const std::weak_ptr<TClient>& c);
+    void TCPClient(const std::weak_ptr<TClient>& c);
+    void Looper(const std::weak_ptr<TClient>& c);
+    int OpenID();
+    void OnDisconnect(const std::weak_ptr<TClient>& ClientPtr, bool kicked);
+    void Parse(TClient& c, const std::string& Packet);
+    void SendFile(TClient& c, const std::string& Name);
+    static bool TCPSendRaw(TClient& C, SOCKET socket, char* Data, int32_t Size);
+    static void SplitLoad(TClient& c, size_t Sent, size_t Size, bool D, const std::string& Name);
+};

include/TPPSMonitor.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#include "Common.h"
+#include "TServer.h"
+#include <optional>
+
+class TNetwork;
+
+class TPPSMonitor : public IThreaded {
+public:
+    explicit TPPSMonitor(TServer& Server);
+
+    void operator()() override;
+
+    void SetInternalPPS(int NewPPS) { mInternalPPS = NewPPS; }
+    void IncrementInternalPPS() { ++mInternalPPS; }
+    [[nodiscard]] int InternalPPS() const { return mInternalPPS; }
+    void SetNetwork(TNetwork& Server) { mNetwork = std::ref(Server); }
+
+private:
+    TNetwork& Network() { return mNetwork->get(); }
+
+    TServer& mServer;
+    std::optional<std::reference_wrapper<TNetwork>> mNetwork { std::nullopt };
+    bool mShutdown { false };
+    int mInternalPPS { 0 };
+};

include/TPluginMonitor.h

@@ -1,22 +0,0 @@
-#pragma once
-
-#include "Common.h"
-#include "IThreaded.h"
-
-#include <atomic>
-#include <memory>
-#include <unordered_map>
-
-class TLuaEngine;
-
-class TPluginMonitor : IThreaded, public std::enable_shared_from_this<TPluginMonitor> {
-public:
-    TPluginMonitor(const fs::path& Path, std::shared_ptr<TLuaEngine> Engine);
-
-    void operator()();
-
-private:
-    std::shared_ptr<TLuaEngine> mEngine;
-    fs::path mPath;
-    std::unordered_map<std::string, fs::file_time_type> mFileTimes;
-};

include/TResourceManager.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include "Common.h"
+
+class TResourceManager {
+public:
+    TResourceManager();
+
+    [[nodiscard]] size_t MaxModSize() const { return mMaxModSize; }
+    [[nodiscard]] std::string FileList() const { return mFileList; }
+    [[nodiscard]] std::string TrimmedList() const { return mTrimmedList; }
+    [[nodiscard]] std::string FileSizes() const { return mFileSizes; }
+    [[nodiscard]] int ModsLoaded() const { return mModsLoaded; }
+
+private:
+    size_t mMaxModSize = 0;
+    std::string mFileSizes;
+    std::string mFileList;
+    std::string mTrimmedList;
+    int mModsLoaded = 0;
+};

include/TSentry.h

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

include/TServer.h

@@ -0,0 +1,41 @@
+#pragma once
+
+#include "IThreaded.h"
+#include "RWMutex.h"
+#include "TScopedTimer.h"
+#include <functional>
+#include <memory>
+#include <mutex>
+#include <unordered_set>
+
+class TClient;
+class TNetwork;
+class TPPSMonitor;
+
+class TServer final {
+public:
+    using TClientSet = std::unordered_set<std::shared_ptr<TClient>>;
+
+    TServer(const std::vector<std::string_view>& Arguments);
+
+    void InsertClient(const std::shared_ptr<TClient>& Ptr);
+    std::weak_ptr<TClient> InsertNewClient();
+    void RemoveClient(const std::weak_ptr<TClient>&);
+    // in Fn, return true to continue, return false to break
+    void ForEachClient(const std::function<bool(std::weak_ptr<TClient>)>& Fn);
+    size_t ClientCount() const;
+
+    static void GlobalParser(const std::weak_ptr<TClient>& Client, std::string Packet, TPPSMonitor& PPSMonitor, TNetwork& Network);
+    static void HandleEvent(TClient& c, const std::string& Data);
+    RWMutex& GetClientMutex() const { return mClientsMutex; }
+
+    
+    const TScopedTimer UptimeTimer;
+private:
+    TClientSet mClients;
+    mutable RWMutex mClientsMutex;
+    static void ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Network);
+    static bool ShouldSpawn(TClient& c, const std::string& CarJson, int ID);
+    static bool IsUnicycle(TClient& c, const std::string& CarJson);
+    static void Apply(TClient& c, int VID, const std::string& pckt);
+};

scripts/debian-11/1-install-deps.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-apt-get update -y
-
-apt-get install -y liblua5.3-0 liblua5.3-dev curl zip unzip tar cmake make git g++ ninja-build

scripts/debian-11/1.5-git-safe.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-git config --global --add safe.directory $(pwd)
-git config --global --add safe.directory $(pwd)/vcpkg
-git config --global --add safe.directory $(pwd)/deps/commandline

scripts/debian-11/2-configure.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-./vcpkg/bootstrap-vcpkg.sh
-
-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,--build-id=none -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON

scripts/debian-11/3-build-tests.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-cmake --build bin --parallel -t BeamMP-Server-tests

scripts/debian-11/3-build.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-cmake --build bin --parallel -t BeamMP-Server
-
-objcopy --only-keep-debug bin/BeamMP-Server bin/BeamMP-Server.debug
-objcopy --add-gnu-debuglink bin/BeamMP-Server bin/BeamMP-Server.debug
-
-strip -s bin/BeamMP-Server

scripts/debian-11/4-install-runtime-deps.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-apt-get update -y
-
-apt-get install -y liblua5.3-0 curl
-

scripts/debian-12/1-install-deps.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-apt-get update -y
-
-apt-get install -y liblua5.3-0 liblua5.3-dev curl zip unzip tar cmake make git g++ ninja-build

scripts/debian-12/1.5-git-safe.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-git config --global --add safe.directory $(pwd)
-git config --global --add safe.directory $(pwd)/vcpkg
-git config --global --add safe.directory $(pwd)/deps/commandline

scripts/debian-12/2-configure.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-./vcpkg/bootstrap-vcpkg.sh
-
-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,--build-id=none -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON

scripts/debian-12/3-build-tests.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-cmake --build bin --parallel -t BeamMP-Server-tests

scripts/debian-12/3-build.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-cmake --build bin --parallel -t BeamMP-Server
-
-objcopy --only-keep-debug bin/BeamMP-Server bin/BeamMP-Server.debug
-objcopy --add-gnu-debuglink bin/BeamMP-Server bin/BeamMP-Server.debug
-
-strip -s bin/BeamMP-Server

scripts/debian-12/4-install-runtime-deps.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-apt-get update -y
-
-apt-get install -y liblua5.3-0 curl
-

scripts/ubuntu-20.04/1-install-deps.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-apt-get update -y
-
-apt-get install -y liblua5.3-0 liblua5.3-dev curl zip unzip tar cmake make git g++ ninja-build

scripts/ubuntu-20.04/1.5-git-safe.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-git config --global --add safe.directory $(pwd)
-git config --global --add safe.directory $(pwd)/vcpkg
-git config --global --add safe.directory $(pwd)/deps/commandline

scripts/ubuntu-20.04/2-configure.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-./vcpkg/bootstrap-vcpkg.sh
-
-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,--build-id=none -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON

scripts/ubuntu-20.04/3-build-tests.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-cmake --build bin --parallel -t BeamMP-Server-tests

scripts/ubuntu-20.04/3-build.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-cmake --build bin --parallel -t BeamMP-Server
-
-objcopy --only-keep-debug bin/BeamMP-Server bin/BeamMP-Server.debug
-objcopy --add-gnu-debuglink bin/BeamMP-Server bin/BeamMP-Server.debug
-
-strip -s bin/BeamMP-Server

scripts/ubuntu-20.04/4-install-runtime-deps.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-apt-get update -y
-
-apt-get install -y liblua5.3-0 curl
-

scripts/ubuntu-22.04/1-install-deps.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-apt-get update -y
-
-apt-get install -y liblua5.3-0 liblua5.3-dev curl zip unzip tar cmake make git g++ ninja-build

scripts/ubuntu-22.04/1.5-git-safe.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-git config --global --add safe.directory $(pwd)
-git config --global --add safe.directory $(pwd)/vcpkg
-git config --global --add safe.directory $(pwd)/deps/commandline

scripts/ubuntu-22.04/2-configure.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-./vcpkg/bootstrap-vcpkg.sh
-
-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,--build-id=none -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON

scripts/ubuntu-22.04/3-build-tests.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-cmake --build bin --parallel -t BeamMP-Server-tests

scripts/ubuntu-22.04/3-build.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-cmake --build bin --parallel -t BeamMP-Server
-
-objcopy --only-keep-debug bin/BeamMP-Server bin/BeamMP-Server.debug
-objcopy --add-gnu-debuglink bin/BeamMP-Server bin/BeamMP-Server.debug
-
-strip -s bin/BeamMP-Server

scripts/ubuntu-22.04/4-install-runtime-deps.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-apt-get update -y
-
-apt-get install -y liblua5.3-0 curl
-

scripts/windows/1-configure.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-./vcpkg/vcpkg add port lua
-
-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DBeamMP-Server_ENABLE_LTO=ON -DVCPKG_TARGET_TRIPLET=x64-windows-static

scripts/windows/2-build-tests.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-cmake --build bin --parallel -t BeamMP-Server-tests

scripts/windows/2-build.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-cmake --build bin --parallel -t BeamMP-Server --config Release

src/ArgsParser.cpp

@@ -1,7 +1,6 @@
 #include "ArgsParser.h"
 #include "Common.h"
 #include <algorithm>
-#include <doctest/doctest.h>
 
 void ArgsParser::Parse(const std::vector<std::string_view>& ArgList) {
     for (const auto& Arg : ArgList) {
@@ -13,7 +12,7 @@ void ArgsParser::Parse(const std::vector<std::string_view>& ArgList) {
                 ConsumeLongFlag(std::string(Arg));
             }
         } else {
-            beammp_errorf("Error parsing commandline arguments: Supplied argument '{}' is not a valid argument and was ignored.", Arg);
+            beammp_error("Error parsing commandline arguments: Supplied argument '" + std::string(Arg) + "' is not a valid argument and was ignored.");
         }
     }
 }
@@ -22,7 +21,7 @@ bool ArgsParser::Verify() {
     bool Ok = true;
     for (const auto& RegisteredArg : mRegisteredArguments) {
         if (RegisteredArg.Flags & Flags::REQUIRED && !FoundArgument(RegisteredArg.Names)) {
-            beammp_errorf("Error in commandline arguments: Argument '{}' is required but wasn't found.", RegisteredArg.Names.at(0));
+            beammp_error("Error in commandline arguments: Argument '" + std::string(RegisteredArg.Names.at(0)) + "' is required but wasn't found.");
             Ok = false;
             continue;
         } else if (FoundArgument(RegisteredArg.Names)) {
@@ -93,78 +92,3 @@ void ArgsParser::ConsumeLongFlag(const std::string& Arg) {
         beammp_warn("Argument '" + Name + "' was supplied but isn't a known argument, so it is likely being ignored.");
     }
 }
-
-TEST_CASE("ArgsParser") {
-    ArgsParser parser;
-
-    SUBCASE("Simple args") {
-        parser.RegisterArgument({ "a" }, ArgsParser::Flags::NONE);
-        parser.RegisterArgument({ "hello" }, ArgsParser::Flags::NONE);
-        parser.Parse({ "--a", "--hello" });
-        CHECK(parser.Verify());
-        CHECK(parser.FoundArgument({ "a" }));
-        CHECK(parser.FoundArgument({ "hello" }));
-        CHECK(parser.FoundArgument({ "a", "hello" }));
-        CHECK(!parser.FoundArgument({ "b" }));
-        CHECK(!parser.FoundArgument({ "goodbye" }));
-    }
-
-    SUBCASE("No args") {
-        parser.RegisterArgument({ "a" }, ArgsParser::Flags::NONE);
-        parser.RegisterArgument({ "hello" }, ArgsParser::Flags::NONE);
-        parser.Parse({});
-        CHECK(parser.Verify());
-        CHECK(!parser.FoundArgument({ "a" }));
-        CHECK(!parser.FoundArgument({ "hello" }));
-        CHECK(!parser.FoundArgument({ "a", "hello" }));
-        CHECK(!parser.FoundArgument({ "b" }));
-        CHECK(!parser.FoundArgument({ "goodbye" }));
-        CHECK(!parser.FoundArgument({ "" }));
-    }
-
-    SUBCASE("Value args") {
-        parser.RegisterArgument({ "a" }, ArgsParser::Flags::HAS_VALUE);
-        parser.RegisterArgument({ "hello" }, ArgsParser::Flags::HAS_VALUE);
-        parser.Parse({ "--a=5", "--hello=world" });
-        CHECK(parser.Verify());
-        REQUIRE(parser.FoundArgument({ "a" }));
-        REQUIRE(parser.FoundArgument({ "hello" }));
-        CHECK(parser.GetValueOfArgument({ "a" }).has_value());
-        CHECK(parser.GetValueOfArgument({ "a" }).value() == "5");
-        CHECK(parser.GetValueOfArgument({ "hello" }).has_value());
-        CHECK(parser.GetValueOfArgument({ "hello" }).value() == "world");
-    }
-
-    SUBCASE("Mixed value & no-value args") {
-        parser.RegisterArgument({ "a" }, ArgsParser::Flags::HAS_VALUE);
-        parser.RegisterArgument({ "hello" }, ArgsParser::Flags::NONE);
-        parser.Parse({ "--a=5", "--hello" });
-        CHECK(parser.Verify());
-        REQUIRE(parser.FoundArgument({ "a" }));
-        REQUIRE(parser.FoundArgument({ "hello" }));
-        CHECK(parser.GetValueOfArgument({ "a" }).has_value());
-        CHECK(parser.GetValueOfArgument({ "a" }).value() == "5");
-        CHECK(!parser.GetValueOfArgument({ "hello" }).has_value());
-    }
-
-    SUBCASE("Required args") {
-        SUBCASE("Two required, two present") {
-            parser.RegisterArgument({ "a" }, ArgsParser::Flags::REQUIRED);
-            parser.RegisterArgument({ "hello" }, ArgsParser::Flags::REQUIRED);
-            parser.Parse({ "--a", "--hello" });
-            CHECK(parser.Verify());
-        }
-        SUBCASE("Two required, one present") {
-            parser.RegisterArgument({ "a" }, ArgsParser::Flags::REQUIRED);
-            parser.RegisterArgument({ "hello" }, ArgsParser::Flags::REQUIRED);
-            parser.Parse({ "--a" });
-            CHECK(!parser.Verify());
-        }
-        SUBCASE("Two required, none present") {
-            parser.RegisterArgument({ "a" }, ArgsParser::Flags::REQUIRED);
-            parser.RegisterArgument({ "hello" }, ArgsParser::Flags::REQUIRED);
-            parser.Parse({ "--b" });
-            CHECK(!parser.Verify());
-        }
-    }
-}

src/Client.cpp

@@ -0,0 +1,120 @@
+#include "Client.h"
+
+#include "CustomAssert.h"
+#include "TServer.h"
+#include <memory>
+#include <optional>
+
+// FIXME: add debug prints
+
+void TClient::DeleteCar(int Ident) {
+    std::unique_lock lock(mVehicleDataMutex);
+    auto iter = std::find_if(mVehicleData.begin(), mVehicleData.end(), [&](auto& elem) {
+        return Ident == elem.ID();
+    });
+    if (iter != mVehicleData.end()) {
+        mVehicleData.erase(iter);
+    } else {
+        beammp_debug("tried to erase a vehicle that doesn't exist (not an error)");
+    }
+}
+
+void TClient::ClearCars() {
+    std::unique_lock lock(mVehicleDataMutex);
+    mVehicleData.clear();
+}
+
+int TClient::GetOpenCarID() const {
+    int OpenID = 0;
+    bool found;
+    std::unique_lock lock(mVehicleDataMutex);
+    do {
+        found = true;
+        for (auto& v : mVehicleData) {
+            if (v.ID() == OpenID) {
+                OpenID++;
+                found = false;
+            }
+        }
+    } while (!found);
+    return OpenID;
+}
+
+void TClient::AddNewCar(int Ident, const std::string& Data) {
+    std::unique_lock lock(mVehicleDataMutex);
+    mVehicleData.emplace_back(Ident, Data);
+}
+
+TClient::TVehicleDataLockPair TClient::GetAllCars() {
+    return { &mVehicleData, std::unique_lock(mVehicleDataMutex) };
+}
+
+std::string TClient::GetCarData(int Ident) {
+    { // lock
+        std::unique_lock lock(mVehicleDataMutex);
+        for (auto& v : mVehicleData) {
+            if (v.ID() == Ident) {
+                return v.Data();
+            }
+        }
+    } // unlock
+    DeleteCar(Ident);
+    return "";
+}
+
+void TClient::SetCarData(int Ident, const std::string& Data) {
+    { // lock
+        std::unique_lock lock(mVehicleDataMutex);
+        for (auto& v : mVehicleData) {
+            if (v.ID() == Ident) {
+                v.SetData(Data);
+                return;
+            }
+        }
+    } // unlock
+    DeleteCar(Ident);
+}
+
+int TClient::GetCarCount() const {
+    return int(mVehicleData.size());
+}
+
+TServer& TClient::Server() const {
+    return mServer;
+}
+
+void TClient::EnqueuePacket(const std::string& Packet) {
+    std::unique_lock Lock(mMissedPacketsMutex);
+    mPacketsSync.push(Packet);
+}
+
+TClient::TClient(TServer& Server)
+    : mServer(Server)
+    , mLastPingTime(std::chrono::high_resolution_clock::now()) {
+}
+
+void TClient::UpdatePingTime() {
+    mLastPingTime = std::chrono::high_resolution_clock::now();
+}
+int TClient::SecondsSinceLastPing() {
+    auto seconds = std::chrono::duration_cast<std::chrono::seconds>(
+        std::chrono::high_resolution_clock::now() - mLastPingTime)
+                       .count();
+    return int(seconds);
+}
+
+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;
+            }
+        }
+        return true;
+    });
+    return MaybeClient;
+}

src/Common.cpp

@@ -1,17 +1,14 @@
 #include "Common.h"
 
-#include "Env.h"
 #include "TConsole.h"
 #include <array>
 #include <charconv>
-#include <fmt/core.h>
 #include <iostream>
 #include <map>
 #include <regex>
 #include <sstream>
 #include <thread>
 
-#include "Compat.h"
 #include "CustomAssert.h"
 #include "Http.h"
 
@@ -25,7 +22,6 @@ void Application::RegisterShutdownHandler(const TShutdownHandler& Handler) {
 }
 
 void Application::GracefullyShutdown() {
-    SetShutdown(true);
     static bool AlreadyShuttingDown = false;
     static uint8_t ShutdownAttempts = 0;
     if (AlreadyShuttingDown) {
@@ -47,7 +43,6 @@ void Application::GracefullyShutdown() {
         beammp_info("Subsystem " + std::to_string(i + 1) + "/" + std::to_string(mShutdownHandlers.size()) + " shutting down");
         mShutdownHandlers[i]();
     }
-    // std::exit(-1);
 }
 
 std::string Application::ServerVersionString() {
@@ -65,23 +60,7 @@ std::array<uint8_t, 3> Application::VersionStrToInts(const std::string& str) {
     return Version;
 }
 
-TEST_CASE("Application::VersionStrToInts") {
+// FIXME: This should be used by operator< on Version
-    auto v = Application::VersionStrToInts("1.2.3");
-    CHECK(v[0] == 1);
-    CHECK(v[1] == 2);
-    CHECK(v[2] == 3);
-
-    v = Application::VersionStrToInts("10.20.30");
-    CHECK(v[0] == 10);
-    CHECK(v[1] == 20);
-    CHECK(v[2] == 30);
-
-    v = Application::VersionStrToInts("100.200.255");
-    CHECK(v[0] == 100);
-    CHECK(v[1] == 200);
-    CHECK(v[2] == 255);
-}
-
 bool Application::IsOutdated(const Version& Current, const Version& Newest) {
     if (Newest.major > Current.major) {
         return true;
@@ -94,65 +73,6 @@ bool Application::IsOutdated(const Version& Current, const Version& Newest) {
     }
 }
 
-bool Application::IsShuttingDown() {
-    std::shared_lock Lock(mShutdownMtx);
-    return mShutdown;
-}
-
-void Application::SleepSafeSeconds(size_t Seconds) {
-    // Sleeps for 500 ms, checks if a shutdown occurred, and so forth
-    for (size_t i = 0; i < Seconds * 2; ++i) {
-        if (Application::IsShuttingDown()) {
-            return;
-        } else {
-            std::this_thread::sleep_for(std::chrono::milliseconds(500));
-        }
-    }
-}
-
-TEST_CASE("Application::IsOutdated (version check)") {
-    SUBCASE("Same version") {
-        CHECK(!Application::IsOutdated({ 1, 2, 3 }, { 1, 2, 3 }));
-    }
-    // we need to use over 1-2 digits to test against lexical comparisons
-    SUBCASE("Patch outdated") {
-        for (uint8_t Patch = 0; Patch < 10; ++Patch) {
-            for (uint8_t Minor = 0; Minor < 10; ++Minor) {
-                for (uint8_t Major = 0; Major < 10; ++Major) {
-                    CHECK(Application::IsOutdated({ uint8_t(Major), uint8_t(Minor), uint8_t(Patch) }, { uint8_t(Major), uint8_t(Minor), uint8_t(Patch + 1) }));
-                }
-            }
-        }
-    }
-    SUBCASE("Minor outdated") {
-        for (uint8_t Patch = 0; Patch < 10; ++Patch) {
-            for (uint8_t Minor = 0; Minor < 10; ++Minor) {
-                for (uint8_t Major = 0; Major < 10; ++Major) {
-                    CHECK(Application::IsOutdated({ uint8_t(Major), uint8_t(Minor), uint8_t(Patch) }, { uint8_t(Major), uint8_t(Minor + 1), uint8_t(Patch) }));
-                }
-            }
-        }
-    }
-    SUBCASE("Major outdated") {
-        for (uint8_t Patch = 0; Patch < 10; ++Patch) {
-            for (uint8_t Minor = 0; Minor < 10; ++Minor) {
-                for (uint8_t Major = 0; Major < 10; ++Major) {
-                    CHECK(Application::IsOutdated({ uint8_t(Major), uint8_t(Minor), uint8_t(Patch) }, { uint8_t(Major + 1), uint8_t(Minor), uint8_t(Patch) }));
-                }
-            }
-        }
-    }
-    SUBCASE("All outdated") {
-        for (uint8_t Patch = 0; Patch < 10; ++Patch) {
-            for (uint8_t Minor = 0; Minor < 10; ++Minor) {
-                for (uint8_t Major = 0; Major < 10; ++Major) {
-                    CHECK(Application::IsOutdated({ uint8_t(Major), uint8_t(Minor), uint8_t(Patch) }, { uint8_t(Major + 1), uint8_t(Minor + 1), uint8_t(Patch + 1) }));
-                }
-            }
-        }
-    }
-}
-
 void Application::SetSubsystemStatus(const std::string& Subsystem, Status status) {
     switch (status) {
     case Status::Good:
@@ -170,44 +90,25 @@ void Application::SetSubsystemStatus(const std::string& Subsystem, Status status
     case Status::Shutdown:
         beammp_trace("Subsystem '" + Subsystem + "': Shutdown");
         break;
-    default:
-        beammp_assert_not_reachable();
     }
     std::unique_lock Lock(mSystemStatusMapMutex);
     mSystemStatusMap[Subsystem] = status;
 }
 
-void Application::SetShutdown(bool Val) {
-    std::unique_lock Lock(mShutdownMtx);
-    mShutdown = Val;
-}
-
-TEST_CASE("Application::SetSubsystemStatus") {
-    Application::SetSubsystemStatus("Test", Application::Status::Good);
-    auto Map = Application::GetSubsystemStatuses();
-    CHECK(Map.at("Test") == Application::Status::Good);
-    Application::SetSubsystemStatus("Test", Application::Status::Bad);
-    Map = Application::GetSubsystemStatuses();
-    CHECK(Map.at("Test") == Application::Status::Bad);
-}
-
 void Application::CheckForUpdates() {
     Application::SetSubsystemStatus("UpdateCheck", Application::Status::Starting);
     static bool FirstTime = true;
     // checks current version against latest version
     std::regex VersionRegex { R"(\d+\.\d+\.\d+\n*)" };
     for (const auto& url : GetBackendUrlsInOrder()) {
-        auto Response = Http::GET(url, 443, "/v/s");
+        auto Response = Http::GET(GetBackendUrlsInOrder().at(0), 443, "/v/s");
         bool Matches = std::regex_match(Response, VersionRegex);
         if (Matches) {
             auto MyVersion = ServerVersion();
             auto RemoteVersion = Version(VersionStrToInts(Response));
             if (IsOutdated(MyVersion, RemoteVersion)) {
-                std::string RealVersionString = std::string("v") + RemoteVersion.AsString();
+                std::string RealVersionString = 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";
+                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));
-                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!");
@@ -219,6 +120,9 @@ void Application::CheckForUpdates() {
             if (FirstTime) {
                 beammp_debug("Failed to fetch version from: " + url);
                 beammp_trace("got " + Response);
+                auto Lock = Sentry.CreateExclusiveContext();
+                Sentry.SetContext("get-response", { { "response", Response } });
+                Sentry.LogError("failed to get server version", _file_basename, _line);
                 Application::SetSubsystemStatus("UpdateCheck", Application::Status::Bad);
             }
         }
@@ -248,25 +152,6 @@ std::string ThreadName(bool DebugModeOverride) {
     return "";
 }
 
-TEST_CASE("ThreadName") {
-    RegisterThread("MyThread");
-    auto OrigDebug = Application::Settings.DebugModeEnabled;
-
-    // ThreadName adds a space at the end, legacy but we need it still
-    SUBCASE("Debug mode enabled") {
-        Application::Settings.DebugModeEnabled = true;
-        CHECK(ThreadName(true) == "MyThread ");
-        CHECK(ThreadName(false) == "MyThread ");
-    }
-    SUBCASE("Debug mode disabled") {
-        Application::Settings.DebugModeEnabled = false;
-        CHECK(ThreadName(true) == "MyThread ");
-        CHECK(ThreadName(false) == "");
-    }
-    // cleanup
-    Application::Settings.DebugModeEnabled = OrigDebug;
-}
-
 void RegisterThread(const std::string& str) {
     std::string ThreadId;
 #ifdef BEAMMP_WINDOWS
@@ -277,18 +162,13 @@ void RegisterThread(const std::string& str) {
     ThreadId = std::to_string(gettid());
 #endif
     if (Application::Settings.DebugModeEnabled) {
-        std::ofstream ThreadFile(".Threads.log", std::ios::app);
+        std::ofstream ThreadFile("Threads.log", std::ios::app);
         ThreadFile << ("Thread \"" + str + "\" is TID " + ThreadId) << std::endl;
     }
     auto Lock = std::unique_lock(ThreadNameMapMutex);
     threadNameMap[std::this_thread::get_id()] = str;
 }
 
-TEST_CASE("RegisterThread") {
-    RegisterThread("MyThread");
-    CHECK(threadNameMap.at(std::this_thread::get_id()) == "MyThread");
-}
-
 Version::Version(uint8_t major, uint8_t minor, uint8_t patch)
     : major(major)
     , minor(minor)
@@ -299,30 +179,22 @@ Version::Version(const std::array<uint8_t, 3>& v)
 }
 
 std::string Version::AsString() {
-    return fmt::format("{:d}.{:d}.{:d}", major, minor, patch);
+    std::stringstream ss {};
-}
+    ss << int(major) << "." << int(minor) << "." << int(patch);
-
+    return ss.str();
-TEST_CASE("Version::AsString") {
-    CHECK(Version { 0, 0, 0 }.AsString() == "0.0.0");
-    CHECK(Version { 1, 2, 3 }.AsString() == "1.2.3");
-    CHECK(Version { 255, 255, 255 }.AsString() == "255.255.255");
 }
 
 void LogChatMessage(const std::string& name, int id, const std::string& msg) {
-    if (Application::Settings.LogChat) {
+    std::stringstream ss;
-        std::stringstream ss;
+    ss << ThreadName();
-        ss << ThreadName();
+    ss << "[CHAT] ";
-        ss << "[CHAT] ";
+    if (id != -1) {
-        if (id != -1) {
+        ss << "(" << id << ") <" << name << "> ";
-            ss << "(" << id << ") <" << name << "> ";
+    } else {
-        } else {
+        ss << name << "";
-            ss << name << "";
-        }
-        ss << msg;
-#ifdef DOCTEST_CONFIG_DISABLE
-        Application::Console().Write(ss.str());
-#endif
     }
+    ss << msg;
+    Application::Console().Write(ss.str());
 }
 
 std::string GetPlatformAgnosticErrorString() {
@@ -349,18 +221,5 @@ std::string GetPlatformAgnosticErrorString() {
     }
 #elif defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
     return std::strerror(errno);
-#else
-    return "(no human-readable errors on this platform)";
 #endif
 }
-
-// TODO: add unit tests to SplitString
-void SplitString(const std::string& str, const char delim, std::vector<std::string>& out) {
-    size_t start;
-    size_t end = 0;
-
-    while ((start = str.find_first_not_of(delim, end)) != std::string::npos) {
-        end = str.find(delim, start);
-        out.push_back(str.substr(start, end - start));
-    }
-}

src/Compat.cpp

@@ -1,13 +1,10 @@
 #include "Compat.h"
 
-#include <cstring>
-#include <doctest/doctest.h>
-
 #ifndef WIN32
 
 static struct termios old, current;
 
-static void initTermios(int echo) {
+void initTermios(int echo) {
     tcgetattr(0, &old); /* grab old terminal i/o settings */
     current = old; /* make new settings same as old settings */
     current.c_lflag &= ~ICANON; /* disable buffered i/o */
@@ -19,40 +16,14 @@ static void initTermios(int echo) {
     tcsetattr(0, TCSANOW, &current); /* use these new terminal i/o settings now */
 }
 
-static void resetTermios(void) {
+void resetTermios(void) {
     tcsetattr(0, TCSANOW, &old);
 }
 
-TEST_CASE("init and reset termios") {
+char getch_(int echo) {
-    if (isatty(STDIN_FILENO)) {
-        struct termios original;
-        tcgetattr(0, &original);
-        SUBCASE("no echo") {
-            initTermios(false);
-        }
-        SUBCASE("yes echo") {
-            initTermios(true);
-        }
-        resetTermios();
-        struct termios current;
-        tcgetattr(0, &current);
-        CHECK_EQ(std::memcmp(&current.c_cc, &original.c_cc, sizeof(current.c_cc)), 0);
-        CHECK_EQ(current.c_cflag, original.c_cflag);
-        CHECK_EQ(current.c_iflag, original.c_iflag);
-        CHECK_EQ(current.c_ispeed, original.c_ispeed);
-        CHECK_EQ(current.c_lflag, original.c_lflag);
-        CHECK_EQ(current.c_line, original.c_line);
-        CHECK_EQ(current.c_oflag, original.c_oflag);
-        CHECK_EQ(current.c_ospeed, original.c_ospeed);
-    }
-}
-
-static char getch_(int echo) {
     char ch;
     initTermios(echo);
-    if (read(STDIN_FILENO, &ch, 1) < 0) {
+    read(STDIN_FILENO, &ch, 1);
-        // ignore, not much we can do
-    }
     resetTermios();
     return ch;
 }

src/Env.cpp

@@ -1,20 +0,0 @@
-#include "Env.h"
-#include <optional>
-
-std::optional<std::string> Env::Get(Env::Key key) {
-    auto StrKey = ToString(key);
-    auto Value = std::getenv(StrKey.data());
-    if (!Value || std::string_view(Value).empty()) {
-        return std::nullopt;
-    }
-    return Value;
-}
-
-std::string_view Env::ToString(Env::Key key) {
-    switch (key) {
-    case Key::PROVIDER_UPDATE_MESSAGE:
-        return "BEAMMP_PROVIDER_UPDATE_MESSAGE";
-        break;
-    }
-    return "";
-}

src/Http.cpp

@@ -1,20 +1,26 @@
 #include "Http.h"
 
+#include "Client.h"
 #include "Common.h"
 #include "CustomAssert.h"
 #include "LuaAPI.h"
+#include "httplib.h"
 
 #include <map>
-#include <nlohmann/json.hpp>
 #include <random>
+#include <rapidjson/document.h>
+#include <rapidjson/rapidjson.h>
+#include <rapidjson/stringbuffer.h>
+#include <rapidjson/writer.h>
 #include <stdexcept>
-
+fs::path Http::Server::THttpServerInstance::KeyFilePath;
+fs::path Http::Server::THttpServerInstance::CertFilePath;
 // TODO: Add sentry error handling back
 
-using json = nlohmann::json;
+namespace json = rapidjson;
 
 std::string Http::GET(const std::string& host, int port, const std::string& target, unsigned int* status) {
-    static thread_local httplib::SSLClient client(host, port);
+    httplib::SSLClient client(host, port);
     client.enable_server_certificate_verification(false);
     client.set_address_family(AF_INET);
     auto res = client.Get(target.c_str());
@@ -29,7 +35,7 @@ std::string Http::GET(const std::string& host, int port, const std::string& targ
 }
 
 std::string Http::POST(const std::string& host, int port, const std::string& target, const std::string& body, const std::string& ContentType, unsigned int* status, const httplib::Headers& headers) {
-    static thread_local httplib::SSLClient client(host, port);
+    httplib::SSLClient client(host, port);
     client.set_read_timeout(std::chrono::seconds(10));
     beammp_assert(client.is_valid());
     client.enable_server_certificate_verification(false);
@@ -140,10 +146,145 @@ std::string Http::Status::ToString(int Code) {
     }
 }
 
-TEST_CASE("Http::Status::ToString") {
+long Http::Server::Tx509KeypairGenerator::GenerateRandomId() {
-    CHECK(Http::Status::ToString(200) == "OK");
+    std::random_device R;
-    CHECK(Http::Status::ToString(696969) == "696969");
+    std::default_random_engine E1(R());
-    CHECK(Http::Status::ToString(-1) == "Invalid Response Code");
+    std::uniform_int_distribution<long> UniformDist(0, ULONG_MAX);
+    return UniformDist(E1);
+}
+
+// Http::Server::THttpServerInstance::THttpServerInstance() { }
+EVP_PKEY* Http::Server::Tx509KeypairGenerator::GenerateKey() {
+    /**
+     * Allocate memory for the pkey
+     */
+    EVP_PKEY* PKey = EVP_PKEY_new();
+    if (PKey == nullptr) {
+        beammp_error("Could not allocate memory for X.509 private key (PKEY) generation.");
+        throw std::runtime_error { std::string { "X.509 PKEY allocation error" } };
+    }
+    BIGNUM* E = BN_new();
+    beammp_assert(E); // TODO: replace all these asserts with beammp_errors
+    unsigned char three = 3;
+    BIGNUM* EErr = BN_bin2bn(&three, sizeof(three), E);
+    beammp_assert(EErr);
+    RSA* Rsa = RSA_new();
+    beammp_assert(Rsa);
+    int Ret = RSA_generate_key_ex(Rsa, Crypto::RSA_DEFAULT_KEYLENGTH, E, nullptr);
+    beammp_assert(Ret == 1);
+    BN_free(E);
+    if (!EVP_PKEY_assign_RSA(PKey, Rsa)) {
+        EVP_PKEY_free(PKey);
+        beammp_error(std::string("Could not generate " + std::to_string(Crypto::RSA_DEFAULT_KEYLENGTH) + "-bit RSA key."));
+        throw std::runtime_error { std::string("X.509 RSA key generation error") };
+    }
+    // todo: figure out if returning by reference instead of passing pointers is a security breach
+    return PKey;
+}
+
+X509* Http::Server::Tx509KeypairGenerator::GenerateCertificate(EVP_PKEY& PKey) {
+    X509* X509 = X509_new();
+    if (X509 == nullptr) {
+        X509_free(X509);
+        beammp_error("Could not allocate memory for X.509 certificate generation.");
+        throw std::runtime_error { std::string("X.509 certificate generation error") };
+    }
+
+    /**Set the metadata of the certificate*/
+    ASN1_INTEGER_set(X509_get_serialNumber(X509), GenerateRandomId());
+
+    /**Set the cert validity to a year*/
+    X509_gmtime_adj(X509_get_notBefore(X509), 0);
+    X509_gmtime_adj(X509_get_notAfter(X509), 31536000L);
+
+    /**Set the public key of the cert*/
+    X509_set_pubkey(X509, &PKey);
+
+    X509_NAME* Name = X509_get_subject_name(X509);
+
+    /**Set cert metadata*/
+    X509_NAME_add_entry_by_txt(Name, "C", MBSTRING_ASC, (unsigned char*)"GB", -1, -1, 0);
+    X509_NAME_add_entry_by_txt(Name, "O", MBSTRING_ASC, (unsigned char*)"BeamMP Ltd.", -1, -1, 0);
+    X509_NAME_add_entry_by_txt(Name, "CN", MBSTRING_ASC, (unsigned char*)"localhost", -1, -1, 0);
+
+    X509_set_issuer_name(X509, Name);
+
+    // TODO: Hashing with sha256 might cause problems, check later
+    if (!X509_sign(X509, &PKey, EVP_sha1())) {
+        X509_free(X509);
+        beammp_error("Could not sign X.509 certificate.");
+        throw std::runtime_error { std::string("X.509 certificate signing error") };
+    }
+    return X509;
+}
+
+void Http::Server::Tx509KeypairGenerator::GenerateAndWriteToDisk(const fs::path& KeyFilePath, const fs::path& CertFilePath) {
+    // todo: generate directories for ssl keys
+    FILE* KeyFile = std::fopen(reinterpret_cast<const char*>(KeyFilePath.c_str()), "wb");
+    if (!KeyFile) {
+        beammp_error("Could not create file 'key.pem', check your permissions");
+        throw std::runtime_error("Could not create file 'key.pem'");
+    }
+
+    EVP_PKEY* PKey = Http::Server::Tx509KeypairGenerator::GenerateKey();
+
+    bool WriteOpResult = PEM_write_PrivateKey(KeyFile, PKey, nullptr, nullptr, 0, nullptr, nullptr);
+    fclose(KeyFile);
+
+    if (!WriteOpResult) {
+        beammp_error("Could not write to file 'key.pem', check your permissions");
+        throw std::runtime_error("Could not write to file 'key.pem'");
+    }
+
+    FILE* CertFile = std::fopen(reinterpret_cast<const char*>(CertFilePath.c_str()), "wb"); // x509 file
+    if (!CertFile) {
+        beammp_error("Could not create file 'cert.pem', check your permissions");
+        throw std::runtime_error("Could not create file 'cert.pem'");
+    }
+
+    X509* x509 = Http::Server::Tx509KeypairGenerator::GenerateCertificate(*PKey);
+    WriteOpResult = PEM_write_X509(CertFile, x509);
+    fclose(CertFile);
+
+    if (!WriteOpResult) {
+        beammp_error("Could not write to file 'cert.pem', check your permissions");
+        throw std::runtime_error("Could not write to file 'cert.pem'");
+    }
+    EVP_PKEY_free(PKey);
+    X509_free(x509);
+    return;
+}
+
+bool Http::Server::Tx509KeypairGenerator::EnsureTLSConfigExists() {
+    if (fs::is_regular_file(Application::Settings.SSLKeyPath)
+        && fs::is_regular_file(Application::Settings.SSLCertPath)) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+void Http::Server::SetupEnvironment() {
+    if (!Application::Settings.HTTPServerUseSSL) {
+        return;
+    }
+    auto parent = fs::path(Application::Settings.SSLKeyPath).parent_path();
+    if (!fs::exists(parent))
+        fs::create_directories(parent);
+
+    Application::TSettings defaultSettings {};
+    if (!Tx509KeypairGenerator::EnsureTLSConfigExists()) {
+        beammp_warn(std::string("No default TLS Key / Cert found. "
+                                "IF YOU HAVE NOT MODIFIED THE SSLKeyPath OR SSLCertPath VALUES "
+                                "THIS IS NORMAL ON FIRST STARTUP! BeamMP will generate it's own certs in the default directory "
+                                "(Check for permissions or corrupted key-/certfile)"));
+        Tx509KeypairGenerator::GenerateAndWriteToDisk(defaultSettings.SSLKeyPath, defaultSettings.SSLCertPath);
+        Http::Server::THttpServerInstance::KeyFilePath = defaultSettings.SSLKeyPath;
+        Http::Server::THttpServerInstance::CertFilePath = defaultSettings.SSLCertPath;
+    } else {
+        Http::Server::THttpServerInstance::KeyFilePath = Application::Settings.SSLKeyPath;
+        Http::Server::THttpServerInstance::CertFilePath = Application::Settings.SSLCertPath;
+    }
 }
 
 Http::Server::THttpServerInstance::THttpServerInstance() {
@@ -155,7 +296,13 @@ Http::Server::THttpServerInstance::THttpServerInstance() {
 void Http::Server::THttpServerInstance::operator()() try {
     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>();
+    if (Application::Settings.HTTPServerUseSSL) {
+        HttpLibServerInstance = std::make_unique<httplib::SSLServer>(
+            reinterpret_cast<const char*>(Http::Server::THttpServerInstance::CertFilePath.c_str()),
+            reinterpret_cast<const char*>(Http::Server::THttpServerInstance::KeyFilePath.c_str()));
+    } else {
+        HttpLibServerInstance = std::make_unique<httplib::Server>();
+    }
     // todo: make this IP agnostic so people can set their own IP
     HttpLibServerInstance->Get("/", [](const httplib::Request&, httplib::Response& res) {
         res.set_content("<!DOCTYPE html><article><h1>Hello World!</h1><section><p>BeamMP Server can now serve HTTP requests!</p></section></article></html>", "text/html");
@@ -175,18 +322,50 @@ void Http::Server::THttpServerInstance::operator()() try {
             case Application::Status::Bad:
                 SystemsBad++;
                 break;
-            default:
-                beammp_assert_not_reachable();
             }
         }
-        res.set_content(
+        res.set_content(SystemsBad == 0 ? "0" : "1", "text/plain");
-            nlohmann::json {
-                { "ok", SystemsBad == 0 },
-            }
-                .dump(),
-            "application/json");
         res.status = 200;
     });
+    /*
+    HttpLibServerInstance->Get("/status", [](const httplib::Request&, httplib::Response& res) {
+        try {
+            json::Document response;
+            response.SetObject();
+            rapidjson::Document::AllocatorType& Allocator = response.GetAllocator();
+            // add to response
+            auto& Server = LuaAPI::MP::Engine->Server();
+            size_t CarCount = 0;
+            size_t GuestCount = 0;
+            json::Value Array(rapidjson::kArrayType);
+            LuaAPI::MP::Engine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
+                if (!Client.expired()) {
+                    auto Locked = Client.lock();
+                    CarCount += Locked->GetCarCount();
+                    GuestCount += Locked->IsGuest() ? 1 : 0;
+                    json::Value Player(json::kObjectType);
+                    Player.AddMember("name", json::StringRef(Locked->GetName().c_str()), Allocator);
+                    Player.AddMember("id", Locked->GetID(), Allocator);
+                    Array.PushBack(Player, Allocator);
+                }
+                return true;
+            });
+            response.AddMember("players", Array, Allocator);
+            response.AddMember("player_count", Server.ClientCount(), Allocator);
+            response.AddMember("guest_count", GuestCount, Allocator);
+            response.AddMember("car_count", CarCount, Allocator);
+
+            // compile & send response
+            json::StringBuffer sb;
+            json::Writer<json::StringBuffer> writer(sb);
+            response.Accept(writer);
+            res.set_content(sb.GetString(), "application/json");
+        } catch (const std::exception& e) {
+            beammp_error("Exception in /status endpoint: " + std::string(e.what()));
+            res.status = 500;
+        }
+    });
+    */
     // magic endpoint
     HttpLibServerInstance->Get({ 0x2f, 0x6b, 0x69, 0x74, 0x74, 0x79 }, [](const httplib::Request&, httplib::Response& res) {
         res.set_content(std::string(Magic), "text/plain");

src/LuaAPI.cpp

@@ -1,10 +1,8 @@
 #include "LuaAPI.h"
+#include "Client.h"
 #include "Common.h"
-#include "CustomAssert.h"
 #include "TLuaEngine.h"
 
-#include <nlohmann/json.hpp>
-
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
@@ -74,10 +72,8 @@ std::string LuaAPI::LuaToString(const sol::object Value, size_t Indent, bool Quo
         ss << "[[function: " << Value.as<sol::function>().pointer() << "]]";
         return ss.str();
     }
-    case sol::type::poly:
-        return "<poly>";
     default:
-        return "<unprintable type>";
+        return "((unprintable type))";
     }
 }
 
@@ -104,115 +100,67 @@ void LuaAPI::Print(sol::variadic_args Args) {
     luaprint(ToPrint);
 }
 
-TEST_CASE("LuaAPI::MP::GetServerVersion") {
+bool LuaAPI::MP::TriggerClientEvent(int PlayerID, const std::string& EventName, const std::string& Data) {
-    const auto [ma, mi, pa] = LuaAPI::MP::GetServerVersion();
+    std::string Packet = "E:" + EventName + ":" + Data;
-    const auto real = Application::ServerVersion();
+    if (PlayerID == -1)
-    CHECK(ma == real.major);
+        Engine->Network().SendToAll(nullptr, Packet, true, true);
-    CHECK(mi == real.minor);
+    else {
-    CHECK(pa == real.patch);
+        auto MaybeClient = GetClient(Engine->Server(), PlayerID);
-}
+        if (!MaybeClient || MaybeClient.value().expired()) {
-
+            beammp_lua_error("TriggerClientEvent invalid Player ID");
-static inline std::pair<bool, std::string> InternalTriggerClientEvent(int PlayerID, const std::string& EventName, const std::string& Data) {
+            return false;
-    throw std::runtime_error(fmt::format("NOT IMPLEMENTED: {}", __func__));
+        }
-    /*
+        auto c = MaybeClient.value().lock();
-        std::string Packet = "E:" + EventName + ":" + Data;
+        if (!Engine->Network().Respond(*c, Packet, true)) {
-        if (PlayerID == -1) {
+            beammp_lua_error("Respond failed, dropping client " + std::to_string(PlayerID));
-            LuaAPI::MP::Engine->Network().SendToAll(nullptr, StringToVector(Packet), true, true);
+            Engine->Network().ClientKick(*c, "Disconnected after failing to receive packets");
-            return { true, "" };
+            return false;
-        } else {
+        }
-            auto MaybeClient = GetClient(LuaAPI::MP::Engine->Server(), PlayerID);
-            if (!MaybeClient) {
-                beammp_lua_errorf("TriggerClientEvent invalid Player ID '{}'", PlayerID);
-                return { false, "Invalid Player ID" };
-            }
-            auto c = MaybeClient.value();
-            if (!LuaAPI::MP::Engine->Network().Respond(*c, StringToVector(Packet), true)) {
-                beammp_lua_errorf("Respond failed, dropping client {}", PlayerID);
-                LuaAPI::MP::Engine->Network().Disconnect(*c);
-                return { false, "Respond failed, dropping client" };
-            }
-            return { true, "" };
-        }*/
-}
-
-std::pair<bool, std::string> LuaAPI::MP::TriggerClientEvent(int PlayerID, const std::string& EventName, const sol::object& DataObj) {
-    std::string Data = DataObj.as<std::string>();
-    return InternalTriggerClientEvent(PlayerID, EventName, Data);
-}
-
-std::pair<bool, std::string> LuaAPI::MP::DropPlayer(int ID, std::optional<std::string> MaybeReason) {
-    throw std::runtime_error(fmt::format("NOT IMPLEMENTED: {}", __func__));
-    /*
-    auto MaybeClient = GetClient(Engine->Server(), ID);
-    if (!MaybeClient) {
-        beammp_lua_errorf("Tried to drop client with id {}, who doesn't exist", ID);
-        return { false, "Player does not exist" };
     }
-    auto c = MaybeClient.value();
+    return true;
-    LuaAPI::MP::Engine->Network().ClientKick(*c, MaybeReason.value_or("No reason"));
-    return { true, "" };
-    */
 }
 
-std::pair<bool, std::string> LuaAPI::MP::SendChatMessage(int ID, const std::string& Message) {
+void LuaAPI::MP::DropPlayer(int ID, std::optional<std::string> MaybeReason) {
-    throw std::runtime_error(fmt::format("NOT IMPLEMENTED: {}", __func__));
+    auto MaybeClient = GetClient(Engine->Server(), ID);
-    /*
+    if (!MaybeClient || MaybeClient.value().expired()) {
-    std::pair<bool, std::string> Result;
+        beammp_lua_error("Tried to drop client with id " + std::to_string(ID) + ", who doesn't exist");
+        return;
+    }
+    auto c = MaybeClient.value().lock();
+    LuaAPI::MP::Engine->Network().ClientKick(*c, MaybeReason.value_or("No reason"));
+}
+
+void LuaAPI::MP::SendChatMessage(int ID, const std::string& Message) {
     std::string Packet = "C:Server: " + Message;
     if (ID == -1) {
         LogChatMessage("<Server> (to everyone) ", -1, Message);
-        Engine->Network().SendToAll(nullptr, StringToVector(Packet), true, true);
+        Engine->Network().SendToAll(nullptr, Packet, true, true);
-        Result.first = true;
     } else {
         auto MaybeClient = GetClient(Engine->Server(), ID);
-        if (MaybeClient) {
+        if (MaybeClient && !MaybeClient.value().expired()) {
-            auto c = MaybeClient.value();
+            auto c = MaybeClient.value().lock();
-            if (!c->IsSynced) {
+            if (!c->IsSynced())
-                Result.first = false;
+                return;
-                Result.second = "Player still syncing data";
+            LogChatMessage("<Server> (to \"" + c->GetName() + "\")", -1, Message);
-                return Result;
+            Engine->Network().Respond(*c, Packet, true);
-            }
-            LogChatMessage("<Server> (to \"" + c->Name.get() + "\")", -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);
-                beammp_infof("Disconnecting client {} for failure to receive a chat message (TCP disconnect)", c->Name.get());
-                Engine->Network().Disconnect(c);
-            }
-            Result.first = true;
         } else {
             beammp_lua_error("SendChatMessage invalid argument [1] invalid ID");
-            Result.first = false;
-            Result.second = "Invalid Player ID";
         }
-        return Result;
     }
-    return Result;
-    */
 }
 
-std::pair<bool, std::string> LuaAPI::MP::RemoveVehicle(int PID, int VID) {
+void LuaAPI::MP::RemoveVehicle(int PID, int VID) {
-    throw std::runtime_error(fmt::format("NOT IMPLEMENTED: {}", __func__));
-    /*
-    std::pair<bool, std::string> Result;
     auto MaybeClient = GetClient(Engine->Server(), PID);
-    if (!MaybeClient) {
+    if (!MaybeClient || MaybeClient.value().expired()) {
         beammp_lua_error("RemoveVehicle invalid Player ID");
-        Result.first = false;
+        return;
-        Result.second = "Invalid Player ID";
-        return Result;
     }
-    auto c = MaybeClient.value();
+    auto c = MaybeClient.value().lock();
     if (!c->GetCarData(VID).empty()) {
         std::string Destroy = "Od:" + std::to_string(PID) + "-" + std::to_string(VID);
-        Engine->Network().SendToAll(nullptr, StringToVector(Destroy), true, true);
+        Engine->Network().SendToAll(nullptr, Destroy, true, true);
         c->DeleteCar(VID);
-        Result.first = true;
-    } else {
-        Result.first = false;
-        Result.second = "Vehicle does not exist";
     }
-    return Result;
-    */
 }
 
 void LuaAPI::MP::Set(int ConfigID, sol::object NewValue) {
@@ -221,57 +169,50 @@ void LuaAPI::MP::Set(int ConfigID, sol::object NewValue) {
         if (NewValue.is<bool>()) {
             Application::Settings.DebugModeEnabled = NewValue.as<bool>();
             beammp_info(std::string("Set `Debug` to ") + (Application::Settings.DebugModeEnabled ? "true" : "false"));
-        } else {
+        } else
             beammp_lua_error("set invalid argument [2] expected boolean");
-        }
         break;
     case 1: // private
         if (NewValue.is<bool>()) {
             Application::Settings.Private = NewValue.as<bool>();
             beammp_info(std::string("Set `Private` to ") + (Application::Settings.Private ? "true" : "false"));
-        } else {
+        } else
             beammp_lua_error("set invalid argument [2] expected boolean");
-        }
         break;
     case 2: // max cars
         if (NewValue.is<int>()) {
             Application::Settings.MaxCars = NewValue.as<int>();
             beammp_info(std::string("Set `MaxCars` to ") + std::to_string(Application::Settings.MaxCars));
-        } else {
+        } else
             beammp_lua_error("set invalid argument [2] expected integer");
-        }
         break;
     case 3: // max players
         if (NewValue.is<int>()) {
             Application::Settings.MaxPlayers = NewValue.as<int>();
             beammp_info(std::string("Set `MaxPlayers` to ") + std::to_string(Application::Settings.MaxPlayers));
-        } else {
+        } else
             beammp_lua_error("set invalid argument [2] expected integer");
-        }
         break;
     case 4: // Map
         if (NewValue.is<std::string>()) {
             Application::Settings.MapName = NewValue.as<std::string>();
             beammp_info(std::string("Set `Map` to ") + Application::Settings.MapName);
-        } else {
+        } else
             beammp_lua_error("set invalid argument [2] expected string");
-        }
         break;
     case 5: // Name
         if (NewValue.is<std::string>()) {
             Application::Settings.ServerName = NewValue.as<std::string>();
             beammp_info(std::string("Set `Name` to ") + Application::Settings.ServerName);
-        } else {
+        } else
             beammp_lua_error("set invalid argument [2] expected string");
-        }
         break;
     case 6: // Desc
         if (NewValue.is<std::string>()) {
             Application::Settings.ServerDesc = NewValue.as<std::string>();
             beammp_info(std::string("Set `Description` to ") + Application::Settings.ServerDesc);
-        } else {
+        } else
             beammp_lua_error("set invalid argument [2] expected string");
-        }
         break;
     default:
         beammp_warn("Invalid config ID \"" + std::to_string(ConfigID) + "\". Use `MP.Settings.*` enum for this.");
@@ -284,26 +225,21 @@ void LuaAPI::MP::Sleep(size_t Ms) {
 }
 
 bool LuaAPI::MP::IsPlayerConnected(int ID) {
-    throw std::runtime_error(fmt::format("NOT IMPLEMENTED: {}", __func__));
-    /*
     auto MaybeClient = GetClient(Engine->Server(), ID);
-    if (MaybeClient) {
+    if (MaybeClient && !MaybeClient.value().expired()) {
-        return MaybeClient.value()->IsConnected.get();
+        return MaybeClient.value().lock()->IsConnected();
-    } else {
+    } else {
-        return false;
+        return false;
-    }*/
+    }
-}
+}
-
+
-bool LuaAPI::MP::IsPlayerGuest(int ID) {
+bool LuaAPI::MP::IsPlayerGuest(int ID) {
-    throw std::runtime_error(fmt::format("NOT IMPLEMENTED: {}", __func__));
+    auto MaybeClient = GetClient(Engine->Server(), ID);
-    /*
+    if (MaybeClient && !MaybeClient.value().expired()) {
-    auto MaybeClient = GetClient(Engine->Server(), ID);
+        return MaybeClient.value().lock()->IsGuest();
-    if (MaybeClient) {
-        return MaybeClient.value()->IsGuest.get();
     } else {
         return false;
     }
-    */
 }
 
 void LuaAPI::MP::PrintRaw(sol::variadic_args Args) {
@@ -312,9 +248,7 @@ void LuaAPI::MP::PrintRaw(sol::variadic_args Args) {
         ToPrint += LuaToString(static_cast<const sol::object>(Arg));
         ToPrint += "\t";
     }
-#ifdef DOCTEST_CONFIG_DISABLE
     Application::Console().WriteRaw(ToPrint);
-#endif
 }
 
 int LuaAPI::PanicHandler(lua_State* State) {
@@ -337,7 +271,7 @@ static std::pair<bool, std::string> FSWrapper(FnT Fn, ArgsT&&... Args) {
 std::pair<bool, std::string> LuaAPI::FS::CreateDirectory(const std::string& Path) {
     std::error_code errc;
     std::pair<bool, std::string> Result;
-    fs::create_directories(Path, errc);
+    fs::create_directories(fs::relative(Path), errc);
     Result.first = errc == std::error_code {};
     if (!Result.first) {
         Result.second = errc.message();
@@ -345,33 +279,6 @@ std::pair<bool, std::string> LuaAPI::FS::CreateDirectory(const std::string& Path
     return Result;
 }
 
-TEST_CASE("LuaAPI::FS::CreateDirectory") {
-    std::string TestDir = "beammp_test_dir";
-    fs::remove_all(TestDir);
-    SUBCASE("Single level dir") {
-        const auto [Ok, Err] = LuaAPI::FS::CreateDirectory(TestDir);
-        CHECK(Ok);
-        CHECK(Err == "");
-        CHECK(fs::exists(TestDir));
-    }
-    SUBCASE("Multi level dir") {
-        const auto [Ok, Err] = LuaAPI::FS::CreateDirectory(TestDir + "/a/b/c");
-        CHECK(Ok);
-        CHECK(Err == "");
-        CHECK(fs::exists(TestDir + "/a/b/c"));
-    }
-    SUBCASE("Already exists") {
-        const auto [Ok, Err] = LuaAPI::FS::CreateDirectory(TestDir);
-        CHECK(Ok);
-        CHECK(Err == "");
-        CHECK(fs::exists(TestDir));
-        const auto [Ok2, Err2] = LuaAPI::FS::CreateDirectory(TestDir);
-        CHECK(Ok2);
-        CHECK(Err2 == "");
-    }
-    fs::remove_all(TestDir);
-}
-
 std::pair<bool, std::string> LuaAPI::FS::Remove(const std::string& Path) {
     std::error_code errc;
     std::pair<bool, std::string> Result;
@@ -383,30 +290,10 @@ std::pair<bool, std::string> LuaAPI::FS::Remove(const std::string& Path) {
     return Result;
 }
 
-TEST_CASE("LuaAPI::FS::Remove") {
-    const std::string TestFileOrDir = "beammp_test_thing";
-    SUBCASE("Remove existing directory") {
-        fs::create_directory(TestFileOrDir);
-        const auto [Ok, Err] = LuaAPI::FS::Remove(TestFileOrDir);
-        CHECK(Ok);
-        CHECK_EQ(Err, "");
-        CHECK(!fs::exists(TestFileOrDir));
-    }
-    SUBCASE("Remove non-existing directory") {
-        fs::remove_all(TestFileOrDir);
-        const auto [Ok, Err] = LuaAPI::FS::Remove(TestFileOrDir);
-        CHECK(Ok);
-        CHECK_EQ(Err, "");
-        CHECK(!fs::exists(TestFileOrDir));
-    }
-    // TODO: add tests for files
-    // TODO: add tests for files and folders without access permissions (failure)
-}
-
 std::pair<bool, std::string> LuaAPI::FS::Rename(const std::string& Path, const std::string& NewPath) {
     std::error_code errc;
     std::pair<bool, std::string> Result;
-    fs::rename(Path, NewPath, errc);
+    fs::rename(fs::relative(Path), fs::relative(NewPath), errc);
     Result.first = errc == std::error_code {};
     if (!Result.first) {
         Result.second = errc.message();
@@ -414,25 +301,10 @@ std::pair<bool, std::string> LuaAPI::FS::Rename(const std::string& Path, const s
     return Result;
 }
 
-TEST_CASE("LuaAPI::FS::Rename") {
-    const auto TestDir = "beammp_test_dir";
-    const auto OtherTestDir = "beammp_test_dir_2";
-    fs::remove_all(OtherTestDir);
-    fs::create_directory(TestDir);
-    const auto [Ok, Err] = LuaAPI::FS::Rename(TestDir, OtherTestDir);
-    CHECK(Ok);
-    CHECK_EQ(Err, "");
-    CHECK(!fs::exists(TestDir));
-    CHECK(fs::exists(OtherTestDir));
-
-    fs::remove_all(OtherTestDir);
-    fs::remove_all(TestDir);
-}
-
 std::pair<bool, std::string> LuaAPI::FS::Copy(const std::string& Path, const std::string& NewPath) {
     std::error_code errc;
     std::pair<bool, std::string> Result;
-    fs::copy(Path, NewPath, fs::copy_options::recursive, errc);
+    fs::copy(fs::relative(Path), fs::relative(NewPath), fs::copy_options::recursive, errc);
     Result.first = errc == std::error_code {};
     if (!Result.first) {
         Result.second = errc.message();
@@ -440,86 +312,30 @@ std::pair<bool, std::string> LuaAPI::FS::Copy(const std::string& Path, const std
     return Result;
 }
 
-TEST_CASE("LuaAPI::FS::Copy") {
-    const auto TestDir = "beammp_test_dir";
-    const auto OtherTestDir = "beammp_test_dir_2";
-    fs::remove_all(OtherTestDir);
-    fs::create_directory(TestDir);
-    const auto [Ok, Err] = LuaAPI::FS::Copy(TestDir, OtherTestDir);
-    CHECK(Ok);
-    CHECK_EQ(Err, "");
-    CHECK(fs::exists(TestDir));
-    CHECK(fs::exists(OtherTestDir));
-
-    fs::remove_all(OtherTestDir);
-    fs::remove_all(TestDir);
-}
-
 bool LuaAPI::FS::Exists(const std::string& Path) {
-    return fs::exists(Path);
+    return fs::exists(fs::relative(Path));
-}
-
-TEST_CASE("LuaAPI::FS::Exists") {
-    const auto TestDir = "beammp_test_dir";
-    const auto OtherTestDir = "beammp_test_dir_2";
-    fs::remove_all(OtherTestDir);
-    fs::create_directory(TestDir);
-
-    CHECK(LuaAPI::FS::Exists(TestDir));
-    CHECK(!LuaAPI::FS::Exists(OtherTestDir));
-
-    fs::remove_all(OtherTestDir);
-    fs::remove_all(TestDir);
 }
 
 std::string LuaAPI::FS::GetFilename(const std::string& Path) {
     return fs::path(Path).filename().string();
 }
 
-TEST_CASE("LuaAPI::FS::GetFilename") {
-    CHECK(LuaAPI::FS::GetFilename("test.txt") == "test.txt");
-    CHECK(LuaAPI::FS::GetFilename("/test.txt") == "test.txt");
-    CHECK(LuaAPI::FS::GetFilename("place/test.txt") == "test.txt");
-    CHECK(LuaAPI::FS::GetFilename("/some/../place/test.txt") == "test.txt");
-}
-
 std::string LuaAPI::FS::GetExtension(const std::string& Path) {
     return fs::path(Path).extension().string();
 }
 
-TEST_CASE("LuaAPI::FS::GetExtension") {
-    CHECK(LuaAPI::FS::GetExtension("test.txt") == ".txt");
-    CHECK(LuaAPI::FS::GetExtension("/test.txt") == ".txt");
-    CHECK(LuaAPI::FS::GetExtension("place/test.txt") == ".txt");
-    CHECK(LuaAPI::FS::GetExtension("/some/../place/test.txt") == ".txt");
-    CHECK(LuaAPI::FS::GetExtension("/some/../place/test") == "");
-    CHECK(LuaAPI::FS::GetExtension("/some/../place/test.a.b.c") == ".c");
-    CHECK(LuaAPI::FS::GetExtension("/some/../place/test.") == ".");
-    CHECK(LuaAPI::FS::GetExtension("/some/../place/test.a.b.") == ".");
-}
-
 std::string LuaAPI::FS::GetParentFolder(const std::string& Path) {
     return fs::path(Path).parent_path().string();
 }
 
-TEST_CASE("LuaAPI::FS::GetParentFolder") {
-    CHECK(LuaAPI::FS::GetParentFolder("test.txt") == "");
-    CHECK(LuaAPI::FS::GetParentFolder("/test.txt") == "/");
-    CHECK(LuaAPI::FS::GetParentFolder("place/test.txt") == "place");
-    CHECK(LuaAPI::FS::GetParentFolder("/some/../place/test.txt") == "/some/../place");
-}
-
-// TODO: add tests
 bool LuaAPI::FS::IsDirectory(const std::string& Path) {
     return fs::is_directory(Path);
 }
 
-// TODO: add tests
 bool LuaAPI::FS::IsFile(const std::string& Path) {
     return fs::is_regular_file(Path);
 }
 
-// TODO: add tests
 std::string LuaAPI::FS::ConcatPaths(sol::variadic_args Args) {
     fs::path Path;
     for (size_t i = 0; i < Args.size(); ++i) {
@@ -536,161 +352,3 @@ std::string LuaAPI::FS::ConcatPaths(sol::variadic_args Args) {
     auto Result = Path.lexically_normal().string();
     return Result;
 }
-
-static void JsonEncodeRecursive(nlohmann::json& json, const sol::object& left, const sol::object& right, bool is_array, size_t depth = 0) {
-    if (depth > 100) {
-        beammp_lua_error("json serialize will not go deeper than 100 nested tables, internal references assumed, aborted this path");
-        return;
-    }
-    std::string key {};
-    switch (left.get_type()) {
-    case sol::type::lua_nil:
-    case sol::type::none:
-    case sol::type::poly:
-    case sol::type::boolean:
-    case sol::type::lightuserdata:
-    case sol::type::userdata:
-    case sol::type::thread:
-    case sol::type::function:
-    case sol::type::table:
-        beammp_lua_error("JsonEncode: left side of table field is unexpected type");
-        return;
-    case sol::type::string:
-        key = left.as<std::string>();
-        break;
-    case sol::type::number:
-        key = std::to_string(left.as<double>());
-        break;
-    default:
-        beammp_assert_not_reachable();
-    }
-    nlohmann::json value;
-    switch (right.get_type()) {
-    case sol::type::lua_nil:
-    case sol::type::none:
-        return;
-    case sol::type::poly:
-        beammp_lua_warn("unsure what to do with poly type in JsonEncode, ignoring");
-        return;
-    case sol::type::boolean:
-        value = right.as<bool>();
-        break;
-    case sol::type::lightuserdata:
-        beammp_lua_warn("unsure what to do with lightuserdata in JsonEncode, ignoring");
-        return;
-    case sol::type::userdata:
-        beammp_lua_warn("unsure what to do with userdata in JsonEncode, ignoring");
-        return;
-    case sol::type::thread:
-        beammp_lua_warn("unsure what to do with thread in JsonEncode, ignoring");
-        return;
-    case sol::type::string:
-        value = right.as<std::string>();
-        break;
-    case sol::type::number:
-        value = right.as<double>();
-        break;
-    case sol::type::function:
-        beammp_lua_warn("unsure what to do with function in JsonEncode, ignoring");
-        return;
-    case sol::type::table: {
-        bool local_is_array = true;
-        for (const auto& pair : right.as<sol::table>()) {
-            if (pair.first.get_type() != sol::type::number) {
-                local_is_array = false;
-            }
-        }
-        for (const auto& pair : right.as<sol::table>()) {
-            JsonEncodeRecursive(value, pair.first, pair.second, local_is_array, depth + 1);
-        }
-        break;
-    }
-    default:
-        beammp_assert_not_reachable();
-    }
-    if (is_array) {
-        json.push_back(value);
-    } else {
-        json[key] = value;
-    }
-}
-
-std::string LuaAPI::MP::JsonEncode(const sol::table& object) {
-    nlohmann::json json;
-    // table
-    bool is_array = true;
-    for (const auto& pair : object.as<sol::table>()) {
-        if (pair.first.get_type() != sol::type::number) {
-            is_array = false;
-        }
-    }
-    for (const auto& entry : object) {
-        JsonEncodeRecursive(json, entry.first, entry.second, is_array);
-    }
-    return json.dump();
-}
-
-std::string LuaAPI::MP::JsonDiff(const std::string& a, const std::string& b) {
-    if (!nlohmann::json::accept(a)) {
-        beammp_lua_error("JsonDiff first argument is not valid json: `" + a + "`");
-        return "";
-    }
-    if (!nlohmann::json::accept(b)) {
-        beammp_lua_error("JsonDiff second argument is not valid json: `" + b + "`");
-        return "";
-    }
-    auto a_json = nlohmann::json::parse(a);
-    auto b_json = nlohmann::json::parse(b);
-    return nlohmann::json::diff(a_json, b_json).dump();
-}
-
-std::string LuaAPI::MP::JsonDiffApply(const std::string& data, const std::string& patch) {
-    if (!nlohmann::json::accept(data)) {
-        beammp_lua_error("JsonDiffApply first argument is not valid json: `" + data + "`");
-        return "";
-    }
-    if (!nlohmann::json::accept(patch)) {
-        beammp_lua_error("JsonDiffApply second argument is not valid json: `" + patch + "`");
-        return "";
-    }
-    auto a_json = nlohmann::json::parse(data);
-    auto b_json = nlohmann::json::parse(patch);
-    a_json.patch(b_json);
-    return a_json.dump();
-}
-
-std::string LuaAPI::MP::JsonPrettify(const std::string& json) {
-    if (!nlohmann::json::accept(json)) {
-        beammp_lua_error("JsonPrettify argument is not valid json: `" + json + "`");
-        return "";
-    }
-    return nlohmann::json::parse(json).dump(4);
-}
-
-std::string LuaAPI::MP::JsonMinify(const std::string& json) {
-    if (!nlohmann::json::accept(json)) {
-        beammp_lua_error("JsonMinify argument is not valid json: `" + json + "`");
-        return "";
-    }
-    return nlohmann::json::parse(json).dump(-1);
-}
-
-std::string LuaAPI::MP::JsonFlatten(const std::string& json) {
-    if (!nlohmann::json::accept(json)) {
-        beammp_lua_error("JsonFlatten argument is not valid json: `" + json + "`");
-        return "";
-    }
-    return nlohmann::json::parse(json).flatten().dump(-1);
-}
-
-std::string LuaAPI::MP::JsonUnflatten(const std::string& json) {
-    if (!nlohmann::json::accept(json)) {
-        beammp_lua_error("JsonUnflatten argument is not valid json: `" + json + "`");
-        return "";
-    }
-    return nlohmann::json::parse(json).unflatten().dump(-1);
-}
-
-std::pair<bool, std::string> LuaAPI::MP::TriggerClientEventJson(int PlayerID, const std::string& EventName, const sol::table& Data) {
-    return InternalTriggerClientEvent(PlayerID, EventName, JsonEncode(Data));
-}

src/TConfig.cpp

@@ -1,7 +1,6 @@
 #include "Common.h"
 
 #include "TConfig.h"
-#include <cstdlib>
 #include <fstream>
 #include <iostream>
 #include <istream>
@@ -9,69 +8,35 @@
 
 // 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") {
+// HTTP
-    const std::string CfgFile = "beammp_server_testconfig.toml";
+static constexpr std::string_view StrHTTPServerEnabled = "HTTPServerEnabled";
-    fs::remove(CfgFile);
+static constexpr std::string_view StrHTTPServerUseSSL = "UseSSL";
-
+static constexpr std::string_view StrSSLKeyPath = "SSLKeyPath";
-    TConfig Cfg(CfgFile);
+static constexpr std::string_view StrSSLCertPath = "SSLCertPath";
-
+static constexpr std::string_view StrHTTPServerPort = "HTTPServerPort";
-    CHECK(fs::file_size(CfgFile) != 0);
+static constexpr std::string_view StrHTTPServerIP = "HTTPServerIP";
-
-    std::string buf;
-    {
-        buf.resize(fs::file_size(CfgFile));
-        auto fp = std::fopen(CfgFile.c_str(), "r");
-        auto res = std::fread(buf.data(), 1, buf.size(), fp);
-        if (res != buf.size()) {
-            // IGNORE?
-        }
-        std::fclose(fp);
-    }
-    INFO("file contents are:", buf);
-
-    const auto table = toml::parse(CfgFile);
-    CHECK(table.at("General").is_table());
-    CHECK(table.at("Misc").is_table());
-
-    fs::remove(CfgFile);
-}
 
 TConfig::TConfig(const std::string& ConfigFileName)
     : mConfigFileName(ConfigFileName) {
     Application::SetSubsystemStatus("Config", Application::Status::Starting);
     if (!fs::exists(mConfigFileName) || !fs::is_regular_file(mConfigFileName)) {
         beammp_info("No config file found! Generating one...");
-        CreateConfigFile();
+        CreateConfigFile(mConfigFileName);
     }
     if (!mFailed) {
         if (fs::exists("Server.cfg")) {
@@ -101,32 +66,36 @@ void TConfig::FlushToFile() {
     auto data = toml::value {};
     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::Settings.LogChat;
-    SetComment(data["General"][StrLogChat.data()].comments(), " Whether to log chat messages in the console / log");
     data["General"][StrDebug.data()] = Application::Settings.DebugModeEnabled;
     data["General"][StrPrivate.data()] = Application::Settings.Private;
     data["General"][StrPort.data()] = Application::Settings.Port;
     data["General"][StrName.data()] = Application::Settings.ServerName;
-    SetComment(data["General"][StrTags.data()].comments(), " Add custom identifying tags to your server to make it easier to find. Format should be TagA,TagB,TagC. Note the comma seperation.");
-    data["General"][StrTags.data()] = Application::Settings.ServerTags;
     data["General"][StrMaxCars.data()] = Application::Settings.MaxCars;
     data["General"][StrMaxPlayers.data()] = Application::Settings.MaxPlayers;
     data["General"][StrMap.data()] = Application::Settings.MapName;
     data["General"][StrDescription.data()] = Application::Settings.ServerDesc;
     data["General"][StrResourceFolder.data()] = Application::Settings.Resource;
-    // data["General"][StrPassword.data()] = Application::Settings.Password;
-    // SetComment(data["General"][StrPassword.data()].comments(), " Sets a password on this server, which restricts people from joining. To join, a player must enter this exact password. Leave empty ("") to disable the password.");
     // Misc
     data["Misc"][StrHideUpdateMessages.data()] = Application::Settings.HideUpdateMessages;
     SetComment(data["Misc"][StrHideUpdateMessages.data()].comments(), " Hides the periodic update message which notifies you of a new server version. You should really keep this on and always update as soon as possible. For more information visit https://wiki.beammp.com/en/home/server-maintenance#updating-the-server. An update message will always appear at startup regardless.");
     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`");
+    SetComment(data["Misc"][StrSendErrors.data()].comments(), " You can turn on/off the SendErrors message you get on startup here");
     data["Misc"][StrSendErrorsMessageEnabled.data()] = Application::Settings.SendErrorsMessageEnabled;
-    SetComment(data["Misc"][StrSendErrorsMessageEnabled.data()].comments(), " You can turn on/off the SendErrors message you get on startup here");
+    SetComment(data["Misc"][StrSendErrorsMessageEnabled.data()].comments(), " If SendErrors is `true`, the server will send helpful info about crashes and other issues back to the BeamMP developers. This info may include your config, who is on your server at the time of the error, and similar general information. This kind of data is vital in helping us diagnose and fix issues faster. This has no impact on server performance. You can opt-out of this system by setting this to `false`");
+    // HTTP
+    data["HTTP"][StrSSLKeyPath.data()] = Application::Settings.SSLKeyPath;
+    data["HTTP"][StrSSLCertPath.data()] = Application::Settings.SSLCertPath;
+    data["HTTP"][StrHTTPServerPort.data()] = Application::Settings.HTTPServerPort;
+    SetComment(data["HTTP"][StrHTTPServerIP.data()].comments(), " Which IP to listen on. Pick 0.0.0.0 for a public-facing server with no specific IP, and 127.0.0.1 or 'localhost' for a local server.");
+    data["HTTP"][StrHTTPServerIP.data()] = Application::Settings.HTTPServerIP;
+    data["HTTP"][StrHTTPServerUseSSL.data()] = Application::Settings.HTTPServerUseSSL;
+    SetComment(data["HTTP"][StrHTTPServerUseSSL.data()].comments(), " Recommended to have enabled for servers which face the internet. With SSL the server will serve https and requires valid key and cert files");
+    data["HTTP"][StrHTTPServerEnabled.data()] = Application::Settings.HTTPServerEnabled;
+    SetComment(data["HTTP"][StrHTTPServerEnabled.data()].comments(), " Enables the internal HTTP server");
     std::stringstream Ss;
     Ss << "# This is the BeamMP-Server config file.\n"
           "# Help & Documentation: `https://wiki.beammp.com/en/home/server-maintenance`\n"
-          "# IMPORTANT: Fill in the AuthKey with the key you got from `https://keymaster.beammp.com/` on the left under \"Keys\"\n"
+          "# IMPORTANT: Fill in the AuthKey with the key you got from `https://beammp.com/k/dashboard` on the left under \"Keys\"\n"
        << data;
     auto File = std::fopen(mConfigFileName.c_str(), "w+");
     if (!File) {
@@ -141,7 +110,7 @@ void TConfig::FlushToFile() {
     std::fclose(File);
 }
 
-void TConfig::CreateConfigFile() {
+void TConfig::CreateConfigFile(std::string_view name) {
     // build from old config Server.cfg
 
     try {
@@ -156,40 +125,21 @@ void TConfig::CreateConfigFile() {
     FlushToFile();
 }
 
-void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, std::string& OutValue) {
+void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, std::string& OutValue) {
-    if (!Env.empty()) {
-        if (const char* envp = std::getenv(Env.data()); envp != nullptr && std::strcmp(envp, "") != 0) {
-            OutValue = std::string(envp);
-            return;
-        }
-    }
     if (Table[Category.c_str()][Key.data()].is_string()) {
         OutValue = Table[Category.c_str()][Key.data()].as_string();
     }
 }
 
-void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, bool& OutValue) {
+void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, 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) {
+void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, 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());
+        OutValue = Table[Category.c_str()][Key.data()].as_integer();
     }
 }
 
@@ -197,23 +147,27 @@ void TConfig::ParseFromFile(std::string_view name) {
     try {
         toml::value data = toml::parse<toml::preserve_comments>(name.data());
         // GENERAL
-        TryReadValue(data, "General", StrDebug, EnvStrDebug, Application::Settings.DebugModeEnabled);
+        TryReadValue(data, "General", StrDebug, Application::Settings.DebugModeEnabled);
-        TryReadValue(data, "General", StrPrivate, EnvStrPrivate, Application::Settings.Private);
+        TryReadValue(data, "General", StrPrivate, Application::Settings.Private);
-        TryReadValue(data, "General", StrPort, EnvStrPort, Application::Settings.Port);
+        TryReadValue(data, "General", StrPort, Application::Settings.Port);
-        TryReadValue(data, "General", StrMaxCars, EnvStrMaxCars, Application::Settings.MaxCars);
+        TryReadValue(data, "General", StrMaxCars, Application::Settings.MaxCars);
-        TryReadValue(data, "General", StrMaxPlayers, EnvStrMaxPlayers, Application::Settings.MaxPlayers);
+        TryReadValue(data, "General", StrMaxPlayers, Application::Settings.MaxPlayers);
-        TryReadValue(data, "General", StrMap, EnvStrMap, Application::Settings.MapName);
+        TryReadValue(data, "General", StrMap, Application::Settings.MapName);
-        TryReadValue(data, "General", StrName, EnvStrName, Application::Settings.ServerName);
+        TryReadValue(data, "General", StrName, Application::Settings.ServerName);
-        TryReadValue(data, "General", StrDescription, EnvStrDescription, Application::Settings.ServerDesc);
+        TryReadValue(data, "General", StrDescription, Application::Settings.ServerDesc);
-        TryReadValue(data, "General", StrTags, EnvStrTags, Application::Settings.ServerTags);
+        TryReadValue(data, "General", StrResourceFolder, Application::Settings.Resource);
-        TryReadValue(data, "General", StrResourceFolder, EnvStrResourceFolder, Application::Settings.Resource);
+        TryReadValue(data, "General", StrAuthKey, Application::Settings.Key);
-        TryReadValue(data, "General", StrAuthKey, EnvStrAuthKey, Application::Settings.Key);
-        TryReadValue(data, "General", StrLogChat, EnvStrLogChat, Application::Settings.LogChat);
-        TryReadValue(data, "General", StrPassword, "", Application::Settings.Password);
         // Misc
-        TryReadValue(data, "Misc", StrSendErrors, "", Application::Settings.SendErrors);
+        TryReadValue(data, "Misc", StrSendErrors, Application::Settings.SendErrors);
-        TryReadValue(data, "Misc", StrHideUpdateMessages, "", Application::Settings.HideUpdateMessages);
+        TryReadValue(data, "Misc", StrHideUpdateMessages, Application::Settings.HideUpdateMessages);
-        TryReadValue(data, "Misc", StrSendErrorsMessageEnabled, "", Application::Settings.SendErrorsMessageEnabled);
+        TryReadValue(data, "Misc", StrSendErrorsMessageEnabled, Application::Settings.SendErrorsMessageEnabled);
+        // HTTP
+        TryReadValue(data, "HTTP", StrSSLKeyPath, Application::Settings.SSLKeyPath);
+        TryReadValue(data, "HTTP", StrSSLCertPath, Application::Settings.SSLCertPath);
+        TryReadValue(data, "HTTP", StrHTTPServerPort, Application::Settings.HTTPServerPort);
+        TryReadValue(data, "HTTP", StrHTTPServerIP, Application::Settings.HTTPServerIP);
+        TryReadValue(data, "HTTP", StrHTTPServerEnabled, Application::Settings.HTTPServerEnabled);
+        TryReadValue(data, "HTTP", StrHTTPServerUseSSL, Application::Settings.HTTPServerUseSSL);
     } catch (const std::exception& err) {
         beammp_error("Error parsing config file value: " + std::string(err.what()));
         mFailed = true;
@@ -246,12 +200,13 @@ void TConfig::PrintDebug() {
     beammp_debug(std::string(StrMap) + ": \"" + Application::Settings.MapName + "\"");
     beammp_debug(std::string(StrName) + ": \"" + Application::Settings.ServerName + "\"");
     beammp_debug(std::string(StrDescription) + ": \"" + Application::Settings.ServerDesc + "\"");
-    beammp_debug(std::string(StrTags) + ": " + TagsAsPrettyArray());
-    beammp_debug(std::string(StrLogChat) + ": \"" + (Application::Settings.LogChat ? "true" : "false") + "\"");
     beammp_debug(std::string(StrResourceFolder) + ": \"" + Application::Settings.Resource + "\"");
+    beammp_debug(std::string(StrSSLKeyPath) + ": \"" + Application::Settings.SSLKeyPath + "\"");
+    beammp_debug(std::string(StrSSLCertPath) + ": \"" + Application::Settings.SSLCertPath + "\"");
+    beammp_debug(std::string(StrHTTPServerPort) + ": \"" + std::to_string(Application::Settings.HTTPServerPort) + "\"");
+    beammp_debug(std::string(StrHTTPServerIP) + ": \"" + Application::Settings.HTTPServerIP + "\"");
     // special!
     beammp_debug("Key Length: " + std::to_string(Application::Settings.Key.length()) + "");
-    beammp_debug("Password Protected: " + std::string(Application::Settings.Password.empty() ? "false" : "true"));
 }
 
 void TConfig::ParseOldFormat() {
@@ -306,13 +261,3 @@ void TConfig::ParseOldFormat() {
         Str >> std::ws;
     }
 }
-std::string TConfig::TagsAsPrettyArray() const {
-    std::vector<std::string> TagsArray = {};
-    SplitString(Application::Settings.ServerTags, ',', TagsArray);
-    std::string Pretty = {};
-    for (size_t i = 0; i < TagsArray.size() - 1; ++i) {
-        Pretty += '\"' + TagsArray[i] + "\", ";
-    }
-    Pretty += '\"' + TagsArray.at(TagsArray.size() - 1) + "\"";
-    return Pretty;
-}

src/TConsole.cpp

@@ -2,29 +2,18 @@
 #include "Common.h"
 #include "Compat.h"
 
+#include "Client.h"
 #include "CustomAssert.h"
 #include "LuaAPI.h"
 #include "TLuaEngine.h"
 
 #include <ctime>
-#include <mutex>
 #include <sstream>
 
 static inline bool StringStartsWith(const std::string& What, const std::string& StartsWith) {
     return What.size() >= StartsWith.size() && What.substr(0, StartsWith.size()) == StartsWith;
 }
 
-TEST_CASE("StringStartsWith") {
-    CHECK(StringStartsWith("Hello, World", "Hello"));
-    CHECK(StringStartsWith("Hello, World", "H"));
-    CHECK(StringStartsWith("Hello, World", ""));
-    CHECK(!StringStartsWith("Hello, World", "ello"));
-    CHECK(!StringStartsWith("Hello, World", "World"));
-    CHECK(StringStartsWith("", ""));
-    CHECK(!StringStartsWith("", "hello"));
-}
-
-// Trims leading and trailing spaces, newlines, tabs, etc.
 static inline std::string TrimString(std::string S) {
     S.erase(S.begin(), std::find_if(S.begin(), S.end(), [](unsigned char ch) {
         return !std::isspace(ch);
@@ -36,22 +25,7 @@ static inline std::string TrimString(std::string S) {
     return S;
 }
 
-TEST_CASE("TrimString") {
+std::string GetDate() {
-    CHECK(TrimString("hel lo") == "hel lo");
-    CHECK(TrimString(" hel lo") == "hel lo");
-    CHECK(TrimString(" hel lo ") == "hel lo");
-    CHECK(TrimString("hel lo     ") == "hel lo");
-    CHECK(TrimString("     hel lo") == "hel lo");
-    CHECK(TrimString("hel lo     ") == "hel lo");
-    CHECK(TrimString("    hel lo     ") == "hel lo");
-    CHECK(TrimString("\t\thel\nlo\n\n") == "hel\nlo");
-    CHECK(TrimString("\n\thel\tlo\n\t") == "hel\tlo");
-    CHECK(TrimString("  ") == "");
-    CHECK(TrimString(" \t\n\r ") == "");
-    CHECK(TrimString("") == "");
-}
-
-static std::string GetDate() {
     std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
     time_t tt = std::chrono::system_clock::to_time_t(now);
     auto local_tm = std::localtime(&tt);
@@ -144,14 +118,14 @@ void TConsole::ChangeToLuaConsole(const std::string& LuaStateId) {
         mStateId = LuaStateId;
         mIsLuaConsole = true;
         if (mStateId != mDefaultStateId) {
-            Application::Console().WriteRaw("Attached to Lua state '" + mStateId + "'. For help, type `:help`. To detach, type `:exit`");
+            Application::Console().WriteRaw("Entered Lua console for state '" + mStateId + "'. To exit, 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`");
+            Application::Console().WriteRaw("Entered Lua console. To exit, type `exit()`");
-            mCommandline->set_prompt("lua> ");
+            mCommandline.set_prompt("lua> ");
         }
-        mCachedRegularHistory = mCommandline->history();
+        mCachedRegularHistory = mCommandline.history();
-        mCommandline->set_history(mCachedLuaHistory);
+        mCommandline.set_history(mCachedLuaHistory);
     }
 }
 
@@ -159,65 +133,32 @@ void TConsole::ChangeToRegularConsole() {
     if (mIsLuaConsole) {
         mIsLuaConsole = false;
         if (mStateId != mDefaultStateId) {
-            Application::Console().WriteRaw("Detached from Lua state '" + mStateId + "'.");
+            Application::Console().WriteRaw("Left Lua console for state '" + mStateId + "'.");
         } else {
-            Application::Console().WriteRaw("Detached from Lua.");
+            Application::Console().WriteRaw("Left Lua console.");
         }
-        mCachedLuaHistory = mCommandline->history();
+        mCachedLuaHistory = mCommandline.history();
-        mCommandline->set_history(mCachedRegularHistory);
+        mCommandline.set_history(mCachedRegularHistory);
-        mCommandline->set_prompt("> ");
+        mCommandline.set_prompt("> ");
         mStateId = mDefaultStateId;
     }
 }
 
-bool TConsole::EnsureArgsCount(const std::vector<std::string>& args, size_t n) {
+void TConsole::Command_Lua(const std::string& cmd) {
-    if (n == 0 && args.size() != 0) {
+    if (cmd.size() > 3) {
-        Application::Console().WriteRaw("This command expects no arguments.");
+        auto NewStateId = cmd.substr(4);
-        return false;
-    } else if (args.size() != n) {
-        Application::Console().WriteRaw("Expected " + std::to_string(n) + " argument(s), instead got " + std::to_string(args.size()));
-        return false;
-    } else {
-        return true;
-    }
-}
-
-bool TConsole::EnsureArgsCount(const std::vector<std::string>& args, size_t min, size_t max) {
-    if (min == max) {
-        return EnsureArgsCount(args, min);
-    } else {
-        if (args.size() > max) {
-            Application::Console().WriteRaw("Too many arguments. At most " + std::to_string(max) + " argument(s) expected, got " + std::to_string(args.size()) + " instead.");
-            return false;
-        } else if (args.size() < min) {
-            Application::Console().WriteRaw("Too few arguments. At least " + std::to_string(min) + " argument(s) expected, got " + std::to_string(args.size()) + " instead.");
-            return false;
-        }
-    }
-    return true;
-}
-
-void TConsole::Command_Lua(const std::string&, const std::vector<std::string>& args) {
-    if (!EnsureArgsCount(args, 0, 1)) {
-        return;
-    }
-    if (args.size() == 1) {
-        auto NewStateId = args.at(0);
         beammp_assert(!NewStateId.empty());
         if (mLuaEngine->HasState(NewStateId)) {
             ChangeToLuaConsole(NewStateId);
         } else {
             Application::Console().WriteRaw("Lua state '" + NewStateId + "' is not a known state. Didn't switch to Lua.");
         }
-    } else if (args.size() == 0) {
+    } else {
         ChangeToLuaConsole(mDefaultStateId);
     }
 }
 
-void TConsole::Command_Help(const std::string&, const std::vector<std::string>& args) {
+void TConsole::Command_Help(const std::string&) {
-    if (!EnsureArgsCount(args, 0)) {
-        return;
-    }
     static constexpr const char* sHelpString = R"(
     Commands:
         help                    displays this help
@@ -226,162 +167,98 @@ void TConsole::Command_Help(const std::string&, const std::vector<std::string>&
         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)";
-        status                  how the server is doing and what it's up to
-        clear                   clears the console window)";
     Application::Console().WriteRaw("BeamMP-Server Console: " + std::string(sHelpString));
 }
 
-std::string TConsole::ConcatArgs(const std::vector<std::string>& args, char space) {
+void TConsole::Command_Kick(const std::string& cmd) {
-    std::string Result;
+    if (cmd.size() > 4) {
-    for (const auto& arg : args) {
+        auto Name = cmd.substr(5);
-        Result += arg + space;
+        std::string Reason = "Kicked by server console";
-    }
+        auto SpacePos = Name.find(' ');
-    Result = Result.substr(0, Result.size() - 1); // strip trailing space
+        if (SpacePos != Name.npos) {
-    return Result;
+            Reason = Name.substr(SpacePos + 1);
-}
+            Name = cmd.substr(5, cmd.size() - Reason.size() - 5 - 1);
-
+        }
-void TConsole::Command_Clear(const std::string&, const std::vector<std::string>& args) {
+        beammp_trace("attempt to kick '" + Name + "' for '" + Reason + "'");
-    if (!EnsureArgsCount(args, 0, size_t(-1))) {
+        bool Kicked = false;
-        return;
+        auto NameCompare = [](std::string Name1, std::string Name2) -> bool {
-    }
+            std::for_each(Name1.begin(), Name1.end(), [](char& c) { c = tolower(c); });
-    mCommandline->write("\x1b[;H\x1b[2J");
+            std::for_each(Name2.begin(), Name2.end(), [](char& c) { c = tolower(c); });
-}
+            return StringStartsWith(Name1, Name2) || StringStartsWith(Name2, Name1);
-
+        };
-void TConsole::Command_Kick(const std::string&, const std::vector<std::string>& args) {
+        mLuaEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
-    if (!EnsureArgsCount(args, 1, size_t(-1))) {
+            if (!Client.expired()) {
-        return;
+                auto locked = Client.lock();
-    }
+                if (NameCompare(locked->GetName(), Name)) {
-    auto Name = args.at(0);
+                    mLuaEngine->Network().ClientKick(*locked, Reason);
-    std::string Reason = "Kicked by server console";
+                    Kicked = true;
-    if (args.size() > 1) {
+                    return false;
-        Reason = ConcatArgs({ args.begin() + 1, args.end() });
-    }
-    beammp_trace("attempt to kick '" + Name + "' for '" + Reason + "'");
-    bool Kicked = false;
-    // TODO: this sucks, tolower is locale-dependent.
-    auto NameCompare = [](std::string Name1, std::string Name2) -> bool {
-        std::for_each(Name1.begin(), Name1.end(), [](char& c) { c = char(std::tolower(char(c))); });
-        std::for_each(Name2.begin(), Name2.end(), [](char& c) { c = char(std::tolower(char(c))); });
-        return StringStartsWith(Name1, Name2) || StringStartsWith(Name2, Name1);
-    };
-    throw std::runtime_error(fmt::format("NOT IMPLEMENTED: {}", __func__));
-    /*mLuaEngine->Server().ForEachClient([&](const std::shared_ptr<TClient>& Client) -> bool {
-            if (NameCompare(Client->Name.get(), Name)) {
-                mLuaEngine->Network().ClientKick(*Client, Reason);
-                Kicked = true;
-                return false;
-            }
-        return true;
-    });*/
-    if (!Kicked) {
-        Application::Console().WriteRaw("Error: No player with name matching '" + Name + "' was found.");
-    } else {
-        Application::Console().WriteRaw("Kicked player '" + Name + "' for reason: '" + Reason + "'.");
-    }
-}
-
-std::tuple<std::string, std::vector<std::string>> TConsole::ParseCommand(const std::string& CommandWithArgs) {
-    // Algorithm designed and implemented by Lion Kortlepel (c) 2022
-    // It correctly splits arguments, including respecting single and double quotes, as well as backticks
-    auto End_i = CommandWithArgs.find_first_of(' ');
-    std::string Command = CommandWithArgs.substr(0, End_i);
-    std::string ArgsStr {};
-    if (End_i != std::string::npos) {
-        ArgsStr = CommandWithArgs.substr(End_i);
-    }
-    std::vector<std::string> Args;
-    char* PrevPtr = ArgsStr.data();
-    char* Ptr = ArgsStr.data();
-    const char* End = ArgsStr.data() + ArgsStr.size();
-    while (Ptr != End) {
-        std::string Arg = "";
-        // advance while space
-        while (Ptr != End && std::isspace(*Ptr))
-            ++Ptr;
-        PrevPtr = Ptr;
-        // advance while NOT space, also handle quotes
-        while (Ptr != End && !std::isspace(*Ptr)) {
-            // TODO: backslash escaping quotes
-            for (char Quote : { '"', '\'', '`' }) {
-                if (*Ptr == Quote) {
-                    // seek if there's a closing quote
-                    // if there is, go there and continue, otherwise ignore
-                    char* Seeker = Ptr + 1;
-                    while (Seeker != End && *Seeker != Quote)
-                        ++Seeker;
-                    if (Seeker != End) {
-                        // found closing quote
-                        Ptr = Seeker;
-                    }
-                    break; // exit for loop
                 }
             }
-            ++Ptr;
+            return true;
+        });
+        if (!Kicked) {
+            Application::Console().WriteRaw("Error: No player with name matching '" + Name + "' was found.");
+        } else {
+            Application::Console().WriteRaw("Kicked player '" + Name + "' for reason: '" + Reason + "'.");
         }
-        // this is required, otherwise we get negative int to unsigned cast in the next operations
-        beammp_assert(PrevPtr <= Ptr);
-        Arg = std::string(PrevPtr, std::string::size_type(Ptr - PrevPtr));
-        // remove quotes if enclosed in quotes
-        for (char Quote : { '"', '\'', '`' }) {
-            if (!Arg.empty() && Arg.at(0) == Quote && Arg.at(Arg.size() - 1) == Quote) {
-                Arg = Arg.substr(1, Arg.size() - 2);
-                break;
-            }
-        }
-        if (!Arg.empty()) {
-            Args.push_back(Arg);
-        }
-    }
-    return { Command, Args };
-}
-
-void TConsole::Command_Settings(const std::string&, const std::vector<std::string>& args) {
-    if (!EnsureArgsCount(args, 1, 2)) {
-        return;
     }
 }
 
-void TConsole::Command_Say(const std::string& FullCmd) {
+void TConsole::Command_Say(const std::string& cmd) {
-    if (FullCmd.size() > 3) {
+    if (cmd.size() > 3) {
-        auto Message = FullCmd.substr(4);
+        auto Message = cmd.substr(4);
         LuaAPI::MP::SendChatMessage(-1, Message);
-        if (!Application::Settings.LogChat) {
-            Application::Console().WriteRaw("Chat message sent!");
-        }
     }
 }
 
-void TConsole::Command_List(const std::string&, const std::vector<std::string>& args) {
+void TConsole::Command_List(const std::string&) {
-    if (!EnsureArgsCount(args, 0)) {
-        return;
-    }
-    // Implement once running
-    throw std::runtime_error(fmt::format("NOT IMPLEMENTED: {}", __func__));
-    /*
     if (mLuaEngine->Server().ClientCount() == 0) {
         Application::Console().WriteRaw("No players online.");
     } else {
         std::stringstream ss;
         ss << std::left << std::setw(25) << "Name" << std::setw(6) << "ID" << std::setw(6) << "Cars" << std::endl;
-        mLuaEngine->Server().ForEachClient([&](const std::shared_ptr<TClient>& Client) -> bool {
+        mLuaEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
-            ss << std::left << std::setw(25) << Client->Name.get()
+            if (!Client.expired()) {
-               << std::setw(6) << Client->ID.get()
+                auto locked = Client.lock();
-               << std::setw(6) << Client->GetCarCount() << "\n";
+                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));
     }
-*/
 }
 
-void TConsole::Command_Status(const std::string&, const std::vector<std::string>& args) {
+void TConsole::Command_Status(const std::string&) {
-    if (!EnsureArgsCount(args, 0)) {
-        return;
-    }
     std::stringstream Status;
 
+    size_t CarCount = 0;
+    size_t ConnectedCount = 0;
+    size_t GuestCount = 0;
+    size_t SyncedCount = 0;
+    size_t SyncingCount = 0;
+    size_t MissedPacketQueueSum = 0;
+    int LargestSecondsSinceLastPing = 0;
+    mLuaEngine->Server().ForEachClient([&](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;
     size_t SystemsGood = 0;
     size_t SystemsBad = 0;
@@ -415,8 +292,6 @@ void TConsole::Command_Status(const std::string&, const std::vector<std::string>
             SystemsShutdown++;
             SystemsShutdownList += NameStatusPair.first + ", ";
             break;
-        default:
-            beammp_assert_not_reachable();
         }
     }
     // remove ", " at the end
@@ -426,22 +301,16 @@ void TConsole::Command_Status(const std::string&, const std::vector<std::string>
     SystemsShuttingDownList = SystemsShuttingDownList.substr(0, SystemsShuttingDownList.size() - 2);
     SystemsShutdownList = SystemsShutdownList.substr(0, SystemsShutdownList.size() - 2);
 
-    auto ElapsedTime = mUptimeTimer.GetElapsedTime();
+    auto ElapsedTime = mLuaEngine->Server().UptimeTimer.GetElapsedTime();
-
-    auto network = mLuaEngine->Network();
-    auto clients = network->all_clients();
 
     Status << "BeamMP-Server Status:\n"
-           << "\tTotal Players:             " << clients.size() << "\n"
+           << "\tTotal Players:             " << mLuaEngine->Server().ClientCount() << "\n"
-           << "\tPlayers identifying:       " << network->clients_in_state_count(bmp::State::Identification) << "\n"
+           << "\tSyncing Players:           " << SyncingCount << "\n"
-           << "\tPlayers authenticating:    " << network->clients_in_state_count(bmp::State::Authentication) << "\n"
+           << "\tSynced Players:            " << SyncedCount << "\n"
-           << "\tPlayers downloading mods:  " << network->clients_in_state_count(bmp::State::ModDownload) << "\n"
+           << "\tConnected Players:         " << ConnectedCount << "\n"
-           << "\tPlayers spawning in:       " << network->clients_in_state_count(bmp::State::SessionSetup) << "\n"
+           << "\tGuests:                    " << GuestCount << "\n"
-           << "\tPlayers playing:           " << network->clients_in_state_count(bmp::State::Playing) << "\n"
+           << "\tCars:                      " << CarCount << "\n"
-           << "\tPlayers leaving:           " << network->clients_in_state_count(bmp::State::Leaving) << "\n"
+           << "\tUptime:                    " << ElapsedTime << "ms (~" << size_t(ElapsedTime / 1000.0 / 60.0 / 60.0) << "h) \n"
-           << "\tGuests:                    " << network->guest_count() << "\n"
-           << "\tVehicles:                  " << network->vehicle_count() << "\n"
-           << "\tUptime:                    " << ElapsedTime << "ms (~" << size_t(double(ElapsedTime) / 1000.0 / 60.0 / 60.0) << "h) \n"
            << "\tLua:\n"
            << "\t\tQueued results to check:     " << mLuaEngine->GetResultsToCheckSize() << "\n"
            << "\t\tStates:                      " << mLuaEngine->GetLuaStateCount() << "\n"
@@ -449,12 +318,12 @@ void TConsole::Command_Status(const std::string&, const std::vector<std::string>
            << "\t\tEvent handlers:              " << mLuaEngine->GetRegisteredEventHandlerCount() << "\n"
            << "\tSubsystems:\n"
            << "\t\tGood/Starting/Bad:           " << SystemsGood << "/" << SystemsStarting << "/" << SystemsBad << "\n"
-           << "\t\tShutting down/Shut down:     " << SystemsShuttingDown << "/" << SystemsShutdown << "\n"
+           << "\t\tShutting down/Shutdown:      " << SystemsShuttingDown << "/" << SystemsShutdown << "\n"
            << "\t\tGood:                        [ " << SystemsGoodList << " ]\n"
            << "\t\tStarting:                    [ " << SystemsStartingList << " ]\n"
            << "\t\tBad:                         [ " << SystemsBadList << " ]\n"
            << "\t\tShutting down:               [ " << SystemsShuttingDownList << " ]\n"
-           << "\t\tShut down:                   [ " << SystemsShutdownList << " ]\n"
+           << "\t\tShutdown:                    [ " << SystemsShutdownList << " ]\n"
            << "";
 
     Application::Console().WriteRaw(Status.str());
@@ -506,83 +375,28 @@ void TConsole::RunAsCommand(const std::string& cmd, bool IgnoreNotACommand) {
     }
 }
 
-void TConsole::HandleLuaInternalCommand(const std::string& cmd) {
-    if (cmd == "exit") {
-        ChangeToRegularConsole();
-    } else if (cmd == "queued") {
-        auto QueuedFunctions = LuaAPI::MP::Engine->Debug_GetStateFunctionQueueForState(mStateId);
-        Application::Console().WriteRaw("Pending functions in State '" + mStateId + "'");
-        std::unordered_map<std::string, size_t> FunctionsCount;
-        std::vector<std::string> FunctionsInOrder;
-        while (!QueuedFunctions.empty()) {
-            auto Tuple = QueuedFunctions.front();
-            QueuedFunctions.erase(QueuedFunctions.begin());
-            FunctionsInOrder.push_back(Tuple.FunctionName);
-            FunctionsCount[Tuple.FunctionName] += 1;
-        }
-        std::set<std::string> Uniques;
-        for (const auto& Function : FunctionsInOrder) {
-            if (Uniques.count(Function) == 0) {
-                Uniques.insert(Function);
-                if (FunctionsCount.at(Function) > 1) {
-                    Application::Console().WriteRaw("    " + Function + " (" + std::to_string(FunctionsCount.at(Function)) + "x)");
-                } else {
-                    Application::Console().WriteRaw("    " + Function);
-                }
-            }
-        }
-        Application::Console().WriteRaw("Executed functions waiting to be checked in State '" + mStateId + "'");
-        for (const auto& Function : LuaAPI::MP::Engine->Debug_GetResultsToCheckForState(mStateId)) {
-            Application::Console().WriteRaw("    '" + Function.Function + "' (Ready? " + (Function.Ready ? "Yes" : "No") + ", Error? " + (Function.Error ? "Yes: '" + Function.ErrorMessage + "'" : "No") + ")");
-        }
-    } else if (cmd == "events") {
-        auto Events = LuaAPI::MP::Engine->Debug_GetEventsForState(mStateId);
-        Application::Console().WriteRaw("Registered Events + Handlers for State '" + mStateId + "'");
-        for (const auto& EventHandlerPair : Events) {
-            Application::Console().WriteRaw("    Event '" + EventHandlerPair.first + "'");
-            for (const auto& Handler : EventHandlerPair.second) {
-                Application::Console().WriteRaw("        " + Handler);
-            }
-        }
-    } else if (cmd == "help") {
-        Application::Console().WriteRaw(R"(BeamMP Lua Debugger
-    All commands must be prefixed with a `:`. Non-prefixed commands are interpreted as Lua.
-
-Commands
-    :exit         detaches (exits) from this Lua console
-    :help         displays this help
-    :events       shows a list of currently registered events
-    :queued       shows a list of all pending and queued functions)");
-    } else {
-        beammp_error("internal command '" + cmd + "' is not known");
-    }
-}
-
 TConsole::TConsole() {
-}
+    mCommandline.enable_history();
-
+    mCommandline.set_history_limit(20);
-void TConsole::InitializeCommandline() {
+    mCommandline.set_prompt("> ");
-    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();
+            auto cmd = c.get_command();
-            TrimmedCmd = TrimString(TrimmedCmd);
+            cmd = TrimString(cmd);
-            auto [cmd, args] = ParseCommand(TrimmedCmd);
+            mCommandline.write(mCommandline.prompt() + cmd);
-            mCommandline->write(mCommandline->prompt() + TrimmedCmd);
             if (mIsLuaConsole) {
                 if (!mLuaEngine) {
                     beammp_info("Lua not started yet, please try again in a second");
-                } else if (!cmd.empty() && cmd.at(0) == ':') {
+                } else if (cmd == "exit()") {
-                    HandleLuaInternalCommand(cmd.substr(1));
+                    ChangeToRegularConsole();
                 } else {
-                    auto Future = mLuaEngine->EnqueueScript(mStateId, { std::make_shared<std::string>(TrimmedCmd), "", "" });
+                    auto Future = mLuaEngine->EnqueueScript(mStateId, { std::make_shared<std::string>(cmd), "", "" });
-                    Future->WaitUntilReady();
+                    while (!Future->Ready) {
+                        std::this_thread::yield(); // TODO: Add a timeout
+                    }
                     if (Future->Error) {
-                        beammp_lua_error("error in " + mStateId + ": " + Future->ErrorMessage);
+                        beammp_lua_error(Future->ErrorMessage);
                     }
                 }
             } else {
@@ -591,107 +405,40 @@ void TConsole::InitializeCommandline() {
                 } else if (cmd == "exit") {
                     beammp_info("gracefully shutting down");
                     Application::GracefullyShutdown();
-                } else if (cmd == "say") {
+                } else if (StringStartsWith(cmd, "lua")) {
-                    RunAsCommand(TrimmedCmd, true);
+                    Command_Lua(cmd);
-                    Command_Say(TrimmedCmd);
+                } else if (StringStartsWith(cmd, "help")) {
-                } else {
+                    RunAsCommand(cmd, true);
-                    if (mCommandMap.find(cmd) != mCommandMap.end()) {
+                    Command_Help(cmd);
-                        mCommandMap.at(cmd)(cmd, args);
+                } else if (StringStartsWith(cmd, "kick")) {
-                        RunAsCommand(TrimmedCmd, true);
+                    RunAsCommand(cmd, true);
-                    } else {
+                    Command_Kick(cmd);
-                        RunAsCommand(TrimmedCmd);
+                } else if (StringStartsWith(cmd, "say")) {
-                    }
+                    RunAsCommand(cmd, true);
+                    Command_Say(cmd);
+                } else if (StringStartsWith(cmd, "list")) {
+                    RunAsCommand(cmd, true);
+                    Command_List(cmd);
+                } else if (StringStartsWith(cmd, "status")) {
+                    RunAsCommand(cmd, true);
+                    Command_Status(cmd);
+                } else if (!cmd.empty()) {
+                    RunAsCommand(cmd);
                 }
             }
         } catch (const std::exception& e) {
             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) {
-        std::vector<std::string> suggestions;
-        try {
-            if (mIsLuaConsole) { // if lua
-                if (!mLuaEngine) {
-                    beammp_info("Lua not started yet, please try again in a second");
-                } else {
-                    std::string prefix {}; // stores non-table part of input
-                    for (size_t i = stub.length(); i > 0; i--) { // separate table from input
-                        if (!std::isalnum(stub[i - 1]) && stub[i - 1] != '_' && stub[i - 1] != '.') {
-                            prefix = stub.substr(0, i);
-                            stub = stub.substr(i);
-                            break;
-                        }
-                    }
-
-                    // turn string into vector of keys
-                    std::vector<std::string> tablekeys;
-
-                    SplitString(stub, '.', tablekeys);
-
-                    // remove last key if incomplete
-                    if (stub.rfind('.') != stub.size() - 1 && !tablekeys.empty()) {
-                        tablekeys.pop_back();
-                    }
-
-                    auto keys = mLuaEngine->GetStateTableKeysForState(mStateId, tablekeys);
-
-                    for (const auto& key : keys) { // go through each bottom-level key
-                        auto last_dot = stub.rfind('.');
-                        std::string last_atom;
-                        if (last_dot != std::string::npos) {
-                            last_atom = stub.substr(last_dot + 1);
-                        }
-                        std::string before_last_atom = stub.substr(0, last_dot + 1); // get last confirmed key
-                        auto last = stub.substr(stub.rfind('.') + 1);
-                        std::string::size_type n = key.find(last);
-                        if (n == 0) {
-                            suggestions.push_back(prefix + before_last_atom + key);
-                        }
-                    }
-                }
-            } else { // if not lua
-                if (stub.find("lua") == 0) { // starts with "lua" means we should suggest state names
-                    std::string after_prefix = TrimString(stub.substr(3));
-                    auto stateNames = mLuaEngine->GetLuaStateNames();
-
-                    for (const auto& name : stateNames) {
-                        if (name.find(after_prefix) == 0) {
-                            suggestions.push_back("lua " + name);
-                        }
-                    }
-                } else {
-                    for (const auto& [cmd_name, cmd_fn] : mCommandMap) {
-                        if (cmd_name.find(stub) == 0) {
-                            suggestions.push_back(cmd_name);
-                        }
-                    }
-                }
-            }
-        } catch (const std::exception& e) {
-            beammp_error("Console died with: " + std::string(e.what()) + ". This could be a fatal error and could cause the server to terminate.");
-        }
-        std::sort(suggestions.begin(), suggestions.end());
-        return suggestions;
-    };
 }
 
 void TConsole::Write(const std::string& str) {
     auto ToWrite = GetDate() + str;
-    // allows writing to stdout without an initialized console
+    mCommandline.write(ToWrite);
-    if (mCommandline) {
-        mCommandline->write(ToWrite);
-    } else {
-        std::cout << ToWrite << std::endl;
-    }
 }
 
 void TConsole::WriteRaw(const std::string& str) {
-    // allows writing to stdout without an initialized console
+    mCommandline.write(str);
-    if (mCommandline) {
-        mCommandline->write(str);
-    } else {
-        std::cout << str << std::endl;
-    }
 }
 
 void TConsole::InitializeLuaConsole(TLuaEngine& Engine) {

src/THeartbeatThread.cpp

@@ -1,7 +1,8 @@
 #include "THeartbeatThread.h"
 
+#include "Client.h"
 #include "Http.h"
-// #include "SocketIO.h"
+//#include "SocketIO.h"
 #include <rapidjson/document.h>
 #include <rapidjson/rapidjson.h>
 #include <sstream>
@@ -19,7 +20,7 @@ void THeartbeatThread::operator()() {
     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()) {
+    while (!mShutdown) {
         ++UpdateReminderCounter;
         Body = GenerateCall();
         // a hot-change occurs when a setting has changed, to update the backend of that change.
@@ -39,6 +40,20 @@ void THeartbeatThread::operator()() {
             Body += "&ip=" + Application::Settings.CustomIP;
         }
 
+        Body += "&pps=" + Application::PPS();
+
+        beammp_trace("heartbeat body: '" + Body + "'");
+
+        auto SentryReportError = [&](const std::string& transaction, int status) {
+            auto Lock = Sentry.CreateExclusiveContext();
+            Sentry.SetContext("heartbeat",
+                { { "response-body", T },
+                    { "request-body", Body } });
+            Sentry.SetTransaction(transaction);
+            beammp_trace("sending log to sentry: " + std::to_string(status) + " for " + transaction);
+            Sentry.Log(SentryLevel::Error, "default", Http::Status::ToString(status) + " (" + std::to_string(status) + ")");
+        };
+
         auto Target = "/heartbeat";
         unsigned int ResponseCode = 0;
 
@@ -46,14 +61,15 @@ void THeartbeatThread::operator()() {
         bool Ok = false;
         for (const auto& Url : Application::GetBackendUrlsInOrder()) {
             T = Http::POST(Url, 443, Target, Body, "application/x-www-form-urlencoded", &ResponseCode, { { "api-v", "2" } });
+            beammp_trace(T);
             Doc.Parse(T.data(), T.size());
             if (Doc.HasParseError() || !Doc.IsObject()) {
-                if (!Application::Settings.Private) {
+                beammp_debug("Failed to contact backend at " + Url + " (this is not an error).");
-                    beammp_trace("Backend response failed to parse as valid json");
+                beammp_trace("Response was: " + T);
-                    beammp_trace("Response was: `" + T + "`");
+                Sentry.SetContext("JSON Response", { { "reponse", T } });
-                }
+                SentryReportError(Url + Target, ResponseCode);
             } else if (ResponseCode != 200) {
-                beammp_errorf("Response code from the heartbeat: {}", ResponseCode);
+                SentryReportError(Url + Target, ResponseCode);
             } else {
                 // all ok
                 Ok = true;
@@ -72,20 +88,24 @@ void THeartbeatThread::operator()() {
             if (Doc.HasMember(StatusKey) && Doc[StatusKey].IsString()) {
                 Status = Doc[StatusKey].GetString();
             } else {
+                Sentry.SetContext("JSON Response", { { StatusKey, "invalid string / missing" } });
                 Ok = false;
             }
             if (Doc.HasMember(CodeKey) && Doc[CodeKey].IsString()) {
                 Code = Doc[CodeKey].GetString();
             } else {
+                Sentry.SetContext("JSON Response", { { CodeKey, "invalid string / missing" } });
                 Ok = false;
             }
             if (Doc.HasMember(MessageKey) && Doc[MessageKey].IsString()) {
                 Message = Doc[MessageKey].GetString();
             } else {
+                Sentry.SetContext("JSON Response", { { MessageKey, "invalid string / missing" } });
                 Ok = false;
             }
             if (!Ok) {
                 beammp_error("Missing/invalid json members in backend response");
+                Sentry.LogError("Missing/invalid json members in backend response", __FILE__, std::to_string(__LINE__));
             }
         } else {
             if (!Application::Settings.Private) {
@@ -93,21 +113,21 @@ void THeartbeatThread::operator()() {
             }
         }
 
-        if (Ok && !isAuth && !Application::Settings.Private) {
+        if (Ok && !isAuth) {
             if (Status == "2000") {
-                beammp_info(("Authenticated! " + Message));
+                beammp_info(("Authenticated!"));
                 isAuth = true;
             } else if (Status == "200") {
-                beammp_info(("Resumed authenticated session! " + Message));
+                beammp_info(("Resumed authenticated session!"));
                 isAuth = true;
             } else {
                 if (Message.empty()) {
-                    Message = "Backend didn't provide a reason.";
+                    Message = "Backend didn't provide a reason";
                 }
-                beammp_error("Backend REFUSED the auth key. Reason: " + Message);
+                beammp_error("Backend REFUSED the auth key. " + Message);
             }
         }
-        if (isAuth || Application::Settings.Private) {
+        if (isAuth) {
             Application::SetSubsystemStatus("Heartbeat", Application::Status::Good);
         }
         if (!Application::Settings.HideUpdateMessages && UpdateReminderCounter % 5) {
@@ -120,29 +140,29 @@ std::string THeartbeatThread::GenerateCall() {
     std::stringstream Ret;
 
     Ret << "uuid=" << Application::Settings.Key
-        << "&players=" << m_network->authenticated_client_count()
+        << "&players=" << mServer.ClientCount()
         << "&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.
+        << "&clientversion=" << Application::ClientVersionString()
         << "&name=" << Application::Settings.ServerName
-        << "&tags=" << Application::Settings.ServerTags
+        << "&modlist=" << mResourceManager.TrimmedList()
-        << "&modlist=" << "-"//mResourceManager.TrimmedList()
+        << "&modstotalsize=" << mResourceManager.MaxModSize()
-        << "&modstotalsize=" << 0 //mResourceManager.MaxModSize()
+        << "&modstotal=" << mResourceManager.ModsLoaded()
-        << "&modstotal=" << 0 // mResourceManager.ModsLoaded()
         << "&playerslist=" << GetPlayers()
-        << "&desc=" << Application::Settings.ServerDesc
+        << "&desc=" << Application::Settings.ServerDesc;
-        << "&pass=" << (Application::Settings.Password.empty() ? "false" : "true");
     return Ret.str();
 }
-THeartbeatThread::THeartbeatThread(std::shared_ptr<Network> network)
+THeartbeatThread::THeartbeatThread(TResourceManager& ResourceManager, TServer& Server)
-    : m_network(std::move(network)) {
+    : mResourceManager(ResourceManager)
+    , mServer(Server) {
     Application::SetSubsystemStatus("Heartbeat", Application::Status::Starting);
     Application::RegisterShutdownHandler([&] {
         Application::SetSubsystemStatus("Heartbeat", Application::Status::ShuttingDown);
         if (mThread.joinable()) {
+            mShutdown = true;
             mThread.join();
         }
         Application::SetSubsystemStatus("Heartbeat", Application::Status::Shutdown);
@@ -150,10 +170,15 @@ THeartbeatThread::THeartbeatThread(std::shared_ptr<Network> network)
     Start();
 }
 std::string THeartbeatThread::GetPlayers() {
-    std::string players;
+    std::string Return;
-    for (const auto& [id, client] : m_network->authenticated_clients()) {
+    mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
-        players += client->name.get() + ";";
+        ReadLock Lock(mServer.GetClientMutex());
-    }
+        if (!ClientPtr.expired()) {
-    return players;
+            Return += ClientPtr.lock()->GetName() + ";";
+        }
+        return true;
+    });
+    return Return;
 }
-
+/*THeartbeatThread::~THeartbeatThread() {
+}*/

src/TLuaEngine.cpp

@@ -1,13 +1,13 @@
 #include "TLuaEngine.h"
+#include "Client.h"
 #include "CustomAssert.h"
 #include "Http.h"
 #include "LuaAPI.h"
 #include "TLuaPlugin.h"
-#include "sol/object.hpp"
 
 #include <chrono>
 #include <condition_variable>
-#include <nlohmann/json.hpp>
+#include <httplib.h>
 #include <random>
 #include <thread>
 #include <tuple>
@@ -15,32 +15,29 @@
 TLuaEngine* LuaAPI::MP::Engine;
 
 TLuaEngine::TLuaEngine()
-    : mResourceServerPath(fs::path(Application::Settings.Resource) / "Server") {
+    : mPluginMonitor(fs::path(Application::Settings.Resource) / "Server", *this, mShutdown) {
     Application::SetSubsystemStatus("LuaEngine", Application::Status::Starting);
     LuaAPI::MP::Engine = this;
     if (!fs::exists(Application::Settings.Resource)) {
         fs::create_directory(Application::Settings.Resource);
     }
-    if (!fs::exists(mResourceServerPath)) {
+    fs::path Path = fs::path(Application::Settings.Resource) / "Server";
-        fs::create_directory(mResourceServerPath);
+    if (!fs::exists(Path)) {
+        fs::create_directory(Path);
     }
+    mResourceServerPath = Path;
     Application::RegisterShutdownHandler([&] {
         Application::SetSubsystemStatus("LuaEngine", Application::Status::ShuttingDown);
+        mShutdown = true;
         if (mThread.joinable()) {
             mThread.join();
         }
         Application::SetSubsystemStatus("LuaEngine", Application::Status::Shutdown);
     });
-    mThread = boost::scoped_thread<>(&TLuaEngine::Start, this);
+    Start();
 }
 
-TEST_CASE("TLuaEngine ctor & dtor") {
+void TLuaEngine::operator()() {
-    Application::Settings.Resource = "beammp_server_test_resources";
-    TLuaEngine engine;
-    Application::GracefullyShutdown();
-}
-
-void TLuaEngine::Start() {
     RegisterThread("LuaEngine");
     Application::SetSubsystemStatus("LuaEngine", Application::Status::Good);
     // lua engine main thread
@@ -56,28 +53,30 @@ void TLuaEngine::Start() {
 
     auto ResultCheckThread = std::thread([&] {
         RegisterThread("ResultCheckThread");
-        while (!Application::IsShuttingDown()) {
+        while (!mShutdown) {
             std::unique_lock Lock(mResultsToCheckMutex);
+            mResultsToCheckCond.wait_for(Lock, std::chrono::milliseconds(20));
             if (!mResultsToCheck.empty()) {
                 mResultsToCheck.remove_if([](const std::shared_ptr<TLuaResult>& Ptr) -> bool {
                     if (Ptr->Ready) {
-                        if (Ptr->Error) {
+                        return true;
-                            if (Ptr->ErrorMessage != BeamMPFnNotFoundError) {
+                    } else if (Ptr->Error) {
-                                beammp_lua_error(Ptr->Function + ": " + Ptr->ErrorMessage);
+                        if (Ptr->ErrorMessage != BeamMPFnNotFoundError) {
-                            }
+                            beammp_lua_error(Ptr->Function + ": " + Ptr->ErrorMessage);
                         }
                         return true;
                     }
                     return false;
                 });
-            } else {
-                mResultsToCheckCond.wait_for(Lock, std::chrono::milliseconds(20));
             }
         }
     });
     // event loop
     auto Before = std::chrono::high_resolution_clock::now();
-    while (!Application::IsShuttingDown()) {
+    while (!mShutdown) {
+        if (mLuaStates.size() == 0) {
+            std::this_thread::sleep_for(std::chrono::seconds(100));
+        }
         { // Timed Events Scope
             std::unique_lock Lock(mTimedEventsMutex);
             for (auto& Timer : mTimedEvents) {
@@ -103,18 +102,12 @@ void TLuaEngine::Start() {
                 }
             }
         }
-        if (mLuaStates.size() == 0) {
+        const auto Expected = std::chrono::milliseconds(10);
-            beammp_trace("No Lua states, event loop running extremely sparsely");
+        if (auto Diff = std::chrono::high_resolution_clock::now() - Before;
-            Application::SleepSafeSeconds(10);
+            Diff < Expected) {
+            std::this_thread::sleep_for(Expected - Diff);
         } else {
-            constexpr double NsFactor = 1000000.0;
+            beammp_trace("Event loop cannot keep up! Running " + std::to_string(Diff.count()) + "s behind");
-            constexpr double Expected = 10.0; // ms
-            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 = std::chrono::high_resolution_clock::now();
     }
@@ -161,131 +154,10 @@ void TLuaEngine::AddResultToCheck(const std::shared_ptr<TLuaResult>& Result) {
     mResultsToCheckCond.notify_one();
 }
 
-std::unordered_map<std::string /* event name */, std::vector<std::string> /* handlers */> TLuaEngine::Debug_GetEventsForState(TLuaStateId StateId) {
-    std::unordered_map<std::string, std::vector<std::string>> Result;
-    std::unique_lock Lock(mLuaEventsMutex);
-    for (const auto& EventNameToEventMap : mLuaEvents) {
-        for (const auto& IdSetOfHandlersPair : EventNameToEventMap.second) {
-            if (IdSetOfHandlersPair.first == StateId) {
-                for (const auto& Handler : IdSetOfHandlersPair.second) {
-                    Result[EventNameToEventMap.first].push_back(Handler);
-                }
-            }
-        }
-    }
-    return Result;
-}
-
-std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> TLuaEngine::Debug_GetStateExecuteQueueForState(TLuaStateId StateId) {
-    std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> Result;
-    std::unique_lock Lock(mLuaStatesMutex);
-    Result = mLuaStates.at(StateId)->Debug_GetStateExecuteQueue();
-    return Result;
-}
-
-std::vector<TLuaEngine::QueuedFunction> TLuaEngine::Debug_GetStateFunctionQueueForState(TLuaStateId StateId) {
-    std::vector<TLuaEngine::QueuedFunction> Result;
-    std::unique_lock Lock(mLuaStatesMutex);
-    Result = mLuaStates.at(StateId)->Debug_GetStateFunctionQueue();
-    return Result;
-}
-
-std::vector<TLuaResult> TLuaEngine::Debug_GetResultsToCheckForState(TLuaStateId StateId) {
-    std::unique_lock Lock(mResultsToCheckMutex);
-    auto ResultsToCheckCopy = mResultsToCheck;
-    Lock.unlock();
-    std::vector<TLuaResult> Result;
-    while (!ResultsToCheckCopy.empty()) {
-        auto ResultToCheck = std::move(ResultsToCheckCopy.front());
-        ResultsToCheckCopy.pop_front();
-        if (ResultToCheck->StateId == StateId) {
-            Result.push_back(*ResultToCheck);
-        }
-    }
-    return Result;
-}
-
-std::vector<std::string> TLuaEngine::GetStateGlobalKeysForState(TLuaStateId StateId) {
-    std::unique_lock Lock(mLuaStatesMutex);
-    auto Result = mLuaStates.at(StateId)->GetStateGlobalKeys();
-    return Result;
-}
-
-std::vector<std::string> TLuaEngine::StateThreadData::GetStateGlobalKeys() {
-    auto globals = mStateView.globals();
-    std::vector<std::string> Result;
-    for (const auto& [key, value] : globals) {
-        Result.push_back(key.as<std::string>());
-    }
-    return Result;
-}
-
-std::vector<std::string> TLuaEngine::GetStateTableKeysForState(TLuaStateId StateId, std::vector<std::string> keys) {
-    std::unique_lock Lock(mLuaStatesMutex);
-    auto Result = mLuaStates.at(StateId)->GetStateTableKeys(keys);
-    return Result;
-}
-
-std::vector<std::string> TLuaEngine::StateThreadData::GetStateTableKeys(const std::vector<std::string>& keys) {
-    auto globals = mStateView.globals();
-
-    sol::table current = globals;
-    std::vector<std::string> Result {};
-
-    for (const auto& [key, value] : current) {
-        std::string s = key.as<std::string>();
-        if (value.get_type() == sol::type::function) {
-            s += "(";
-        }
-        Result.push_back(s);
-    }
-
-    if (!keys.empty()) {
-        Result.clear();
-    }
-
-    for (size_t i = 0; i < keys.size(); ++i) {
-        auto obj = current.get<sol::object>(keys.at(i));
-        if (obj.get_type() == sol::type::nil) {
-            // error
-            break;
-        } else if (i == keys.size() - 1) {
-            if (obj.get_type() == sol::type::table) {
-                for (const auto& [key, value] : obj.as<sol::table>()) {
-                    std::string s = key.as<std::string>();
-                    if (value.get_type() == sol::type::function) {
-                        s += "(";
-                    }
-                    Result.push_back(s);
-                }
-            } else {
-                Result = { obj.as<std::string>() };
-            }
-            break;
-        }
-        if (obj.get_type() == sol::type::table) {
-            current = obj;
-        } else {
-            // error
-            break;
-        }
-    }
-
-    return Result;
-}
-
-/*
-
-    _G.a.b.c.d.
-
-*/
-
 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;
@@ -293,14 +165,9 @@ void TLuaEngine::WaitForAll(std::vector<std::shared_ptr<TLuaResult>>& Results, c
                 beammp_trace("'" + Result->Function + "' in '" + Result->StateId + "' did not finish executing in time (took: " + std::to_string(ms) + "ms).");
                 Cancelled = true;
             } else if (ms > 1000 * 60) {
-                auto ResultId = Result->StateId + "_" + Result->Function;
+                beammp_lua_warn("'" + Result->Function + "' in '" + Result->StateId + "' is taking very long. The event it's handling is too important to discard the result of this handler, but may block this event and possibly the whole lua state.");
-                if (WarnedResults.count(ResultId) == 0) {
-                    WarnedResults.insert(ResultId);
-                    beammp_lua_warn("'" + Result->Function + "' in '" + Result->StateId + "' is taking very long. The event it's handling is too important to discard the result of this handler, but may block this event and possibly the whole lua state.");
-                }
             }
         }
-
         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 });
@@ -337,9 +204,6 @@ std::shared_ptr<TLuaResult> TLuaEngine::EnqueueFunctionCall(TLuaStateId StateID,
 }
 
 void TLuaEngine::CollectAndInitPlugins() {
-    if (!fs::exists(mResourceServerPath)) {
-        fs::create_directories(mResourceServerPath);
-    }
     for (const auto& Dir : fs::directory_iterator(mResourceServerPath)) {
         auto Path = Dir.path();
         Path = fs::relative(Path);
@@ -389,7 +253,7 @@ void TLuaEngine::EnsureStateExists(TLuaStateId StateId, const std::string& Name,
     std::unique_lock Lock(mLuaStatesMutex);
     if (mLuaStates.find(StateId) == mLuaStates.end()) {
         beammp_debug("Creating lua state for state id \"" + StateId + "\"");
-        auto DataPtr = std::make_unique<StateThreadData>(Name, StateId, *this);
+        auto DataPtr = std::make_unique<StateThreadData>(Name, mShutdown, StateId, *this);
         mLuaStates[StateId] = std::move(DataPtr);
         RegisterEvent("onInit", StateId, "onInit");
         if (!DontCallOnInit) {
@@ -413,12 +277,14 @@ std::set<std::string> TLuaEngine::GetEventHandlersForState(const std::string& Ev
 
 sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string& EventName, sol::variadic_args EventArgs) {
     auto Return = mEngine->TriggerEvent(EventName, mStateId, EventArgs);
+    // TODO Synchronous call to the event handlers
     auto MyHandlers = mEngine->GetEventHandlersForState(EventName, mStateId);
     for (const auto& Handler : MyHandlers) {
         auto Fn = mStateView[Handler];
         if (Fn.valid()) {
             auto LuaResult = Fn(EventArgs);
             auto Result = std::make_shared<TLuaResult>();
+            Result->Ready = true;
             if (LuaResult.valid()) {
                 Result->Error = false;
                 Result->Result = LuaResult;
@@ -426,7 +292,6 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string
                 Result->Error = true;
                 Result->ErrorMessage = "Function result in TriggerGlobalEvent was invalid";
             }
-            Result->MarkAsReady();
             Return.push_back(Result);
         }
     }
@@ -470,7 +335,7 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerLocalEvent(const std::string&
                 Result.add(FnRet);
             } else {
                 sol::error Err = FnRet;
-                beammp_lua_error(std::string("TriggerLocalEvent: ") + Err.what());
+                beammp_lua_error(Err.what());
             }
         }
     }
@@ -478,14 +343,14 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerLocalEvent(const std::string&
 }
 
 sol::table TLuaEngine::StateThreadData::Lua_GetPlayerIdentifiers(int ID) {
-    auto MaybeClient = mEngine->Network()->get_client(ClientID(ID), bmp::State::Authentication);
+    auto MaybeClient = GetClient(mEngine->Server(), ID);
-    if (MaybeClient) {
+    if (MaybeClient && !MaybeClient.value().expired()) {
-        auto IDs = MaybeClient.value()->identifiers.synchronize();
+        auto IDs = MaybeClient.value().lock()->GetIdentifiers();
-        if (IDs->empty()) {
+        if (IDs.empty()) {
             return sol::lua_nil;
         }
         sol::table Result = mStateView.create_table();
-        for (const auto& Pair : *IDs) {
+        for (const auto& Pair : IDs) {
             Result[Pair.first] = Pair.second;
         }
         return Result;
@@ -495,97 +360,61 @@ sol::table TLuaEngine::StateThreadData::Lua_GetPlayerIdentifiers(int ID) {
 }
 
 sol::table TLuaEngine::StateThreadData::Lua_GetPlayers() {
-    sol::table result = mStateView.create_table();
+    sol::table Result = mStateView.create_table();
-    auto clients = mEngine->Network()->authenticated_clients();
+    mEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
-    for (const auto& [id, client] : clients) {
+        if (!Client.expired()) {
-        result[client->id] = client->name.get();
+            auto locked = Client.lock();
-    }
+            Result[locked->GetID()] = locked->GetName();
-    return result;
+        }
+        return true;
+    });
+    return Result;
 }
 
 int TLuaEngine::StateThreadData::Lua_GetPlayerIDByName(const std::string& Name) {
-    auto clients = mEngine->Network()->authenticated_clients();
+    int Id = -1;
-    for (const auto& [id, client] : clients) {
+    mEngine->mServer->ForEachClient([&Id, &Name](std::weak_ptr<TClient> Client) -> bool {
-        if (client->name.get() == Name) {
+        if (!Client.expired()) {
-            return int(client->id);
+            auto locked = Client.lock();
+            if (locked->GetName() == Name) {
+                Id = locked->GetID();
+                return false;
+            }
         }
-    }
+        return true;
-    return -1;
+    });
-}
+    return Id;
-
-sol::table TLuaEngine::StateThreadData::Lua_FS_ListFiles(const std::string& Path) {
-    if (!std::filesystem::exists(Path)) {
-        return sol::lua_nil;
-    }
-    auto table = mStateView.create_table();
-    for (const auto& entry : std::filesystem::directory_iterator(Path)) {
-        if (entry.is_regular_file() || entry.is_symlink()) {
-            table[table.size() + 1] = entry.path().lexically_relative(Path).string();
-        }
-    }
-    return table;
-}
-
-sol::table TLuaEngine::StateThreadData::Lua_FS_ListDirectories(const std::string& Path) {
-    if (!std::filesystem::exists(Path)) {
-        return sol::lua_nil;
-    }
-    auto table = mStateView.create_table();
-    for (const auto& entry : std::filesystem::directory_iterator(Path)) {
-        if (entry.is_directory()) {
-            table[table.size() + 1] = entry.path().lexically_relative(Path).string();
-        }
-    }
-    return table;
 }
 
 std::string TLuaEngine::StateThreadData::Lua_GetPlayerName(int ID) {
-    auto maybe_client = mEngine->Network()->get_client(ClientID(ID), bmp::State::Authentication);
+    auto MaybeClient = GetClient(mEngine->Server(), ID);
-    if (maybe_client) {
+    if (MaybeClient && !MaybeClient.value().expired()) {
-        return maybe_client.value()->name.get();
+        return MaybeClient.value().lock()->GetName();
     } else {
         return "";
     }
 }
 
 sol::table TLuaEngine::StateThreadData::Lua_GetPlayerVehicles(int ID) {
-    auto vehicles = mEngine->Network()->get_vehicles_owned_by(ClientID(ID));
+    auto MaybeClient = GetClient(mEngine->Server(), ID);
-    if (vehicles.empty()) {
+    if (MaybeClient && !MaybeClient.value().expired()) {
+        auto Client = MaybeClient.value().lock();
+        TClient::TSetOfVehicleData VehicleData;
+        { // Vehicle Data Lock Scope
+            auto LockedData = Client->GetAllCars();
+            VehicleData = *LockedData.VehicleData;
+        } // End Vehicle Data Lock Scope
+        if (VehicleData.empty()) {
+            return sol::lua_nil;
+        }
+        sol::state_view StateView(mState);
+        sol::table Result = StateView.create_table();
+        for (const auto& v : VehicleData) {
+            Result[v.ID()] = v.Data().substr(3);
+        }
+        return Result;
+    } else
         return sol::lua_nil;
-    }
-    sol::state_view state_view(mState);
-    sol::table result = state_view.create_table();
-    for (const auto& [vid, vehicle] : vehicles) {
-        result[vid] = vehicle->data.get();
-    }
-    return result;
-}
-
-std::pair<sol::table, std::string> TLuaEngine::StateThreadData::Lua_GetVehicleStatus(int VID) {
-    auto maybe_vehicle = mEngine->Network()->get_vehicle(VehicleID(VID));
-    if (maybe_vehicle) {
-        sol::state_view state_view(mState);
-        sol::table result = state_view.create_table();
-        auto veh = maybe_vehicle.value();
-        auto status = veh->get_status();
-        result["pos"]["x"] = status.pos.x;
-        result["pos"]["y"] = status.pos.y;
-        result["pos"]["z"] = status.pos.z;
-        result["vel"]["x"] = status.vel.x;
-        result["vel"]["y"] = status.vel.y;
-        result["vel"]["z"] = status.vel.z;
-        result["rvel"]["x"] = status.rvel.x;
-        result["rvel"]["y"] = status.rvel.y;
-        result["rvel"]["z"] = status.rvel.z;
-        result["rot"]["x"] = status.rot.x;
-        result["rot"]["y"] = status.rot.y;
-        result["rot"]["z"] = status.rot.z;
-        result["rot"]["w"] = status.rot.w;
-        result["time"] = status.time;
-        return { result, "" };
-    } else {
-        return { sol::lua_nil, fmt::format("Vehicle {} not found", VID) };
-    }
 }
 
 sol::table TLuaEngine::StateThreadData::Lua_HttpCreateConnection(const std::string& host, uint16_t port) {
@@ -610,87 +439,9 @@ sol::table TLuaEngine::StateThreadData::Lua_HttpCreateConnection(const std::stri
     return table;
 }
 
-template <typename T>
+TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, std::atomic_bool& Shutdown, TLuaStateId StateId, TLuaEngine& Engine)
-static void AddToTable(sol::table& table, const std::string& left, const T& value) {
-    if (left.empty()) {
-        table[table.size() + 1] = value;
-    } else {
-        table[left] = value;
-    }
-}
-
-static void JsonDecodeRecursive(sol::state_view& StateView, sol::table& table, const std::string& left, const nlohmann::json& right) {
-    switch (right.type()) {
-    case nlohmann::detail::value_t::null:
-        return;
-    case nlohmann::detail::value_t::object: {
-        auto value = table.create();
-        value.clear();
-        for (const auto& entry : right.items()) {
-            JsonDecodeRecursive(StateView, value, entry.key(), entry.value());
-        }
-        AddToTable(table, left, value);
-        break;
-    }
-    case nlohmann::detail::value_t::array: {
-        auto value = table.create();
-        value.clear();
-        for (const auto& entry : right.items()) {
-            JsonDecodeRecursive(StateView, value, "", entry.value());
-        }
-        AddToTable(table, left, value);
-        break;
-    }
-    case nlohmann::detail::value_t::string:
-        AddToTable(table, left, right.get<std::string>());
-        break;
-    case nlohmann::detail::value_t::boolean:
-        AddToTable(table, left, right.get<bool>());
-        break;
-    case nlohmann::detail::value_t::number_integer:
-        AddToTable(table, left, right.get<int64_t>());
-        break;
-    case nlohmann::detail::value_t::number_unsigned:
-        AddToTable(table, left, right.get<uint64_t>());
-        break;
-    case nlohmann::detail::value_t::number_float:
-        AddToTable(table, left, right.get<double>());
-        break;
-    case nlohmann::detail::value_t::binary:
-        beammp_lua_error("JsonDecode can't handle binary blob in json, ignoring");
-        return;
-    case nlohmann::detail::value_t::discarded:
-        return;
-    default:
-        beammp_assert_not_reachable();
-    }
-}
-
-sol::table TLuaEngine::StateThreadData::Lua_JsonDecode(const std::string& str) {
-    sol::state_view StateView(mState);
-    auto table = StateView.create_table();
-    if (!nlohmann::json::accept(str)) {
-        beammp_lua_error("string given to JsonDecode is not valid json: `" + str + "`");
-        return sol::lua_nil;
-    }
-    nlohmann::json json = nlohmann::json::parse(str);
-    if (json.is_object()) {
-        for (const auto& entry : json.items()) {
-            JsonDecodeRecursive(StateView, table, entry.key(), entry.value());
-        }
-    } else if (json.is_array()) {
-        for (const auto& entry : json) {
-            JsonDecodeRecursive(StateView, table, "", entry);
-        }
-    } else {
-        beammp_lua_error("JsonDecode expected array or object json, instead got " + std::string(json.type_name()));
-        return sol::lua_nil;
-    }
-    return table;
-}
-
-TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateId StateId, TLuaEngine& Engine)
     : mName(Name)
+    , mShutdown(Shutdown)
     , mStateId(StateId)
     , mState(luaL_newstate())
     , mEngine(&Engine) {
@@ -733,7 +484,6 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
         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);
     MPTable.set_function("IsPlayerConnected", &LuaAPI::MP::IsPlayerConnected);
     MPTable.set_function("GetPlayerIDByName", [&](const std::string& Name) -> int {
@@ -746,9 +496,6 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
     MPTable.set_function("GetPlayerVehicles", [&](int ID) -> sol::table {
         return Lua_GetPlayerVehicles(ID);
     });
-    MPTable.set_function("GetVehicleStatus", [&](int VID) -> std::pair<sol::table, std::string> {
-        return Lua_GetVehicleStatus(VID);
-    });
     MPTable.set_function("SendChatMessage", &LuaAPI::MP::SendChatMessage);
     MPTable.set_function("GetPlayers", [&]() -> sol::table {
         return Lua_GetPlayers();
@@ -791,27 +538,6 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
         mEngine->CancelEventTimers(EventName, mStateId);
     });
     MPTable.set_function("Set", &LuaAPI::MP::Set);
-
-    auto UtilTable = StateView.create_named_table("Util");
-    UtilTable.set_function("JsonEncode", &LuaAPI::MP::JsonEncode);
-    UtilTable.set_function("JsonDecode", [this](const std::string& str) {
-        return Lua_JsonDecode(str);
-    });
-    UtilTable.set_function("JsonDiff", &LuaAPI::MP::JsonDiff);
-    UtilTable.set_function("JsonFlatten", &LuaAPI::MP::JsonFlatten);
-    UtilTable.set_function("JsonUnflatten", &LuaAPI::MP::JsonUnflatten);
-    UtilTable.set_function("JsonPrettify", &LuaAPI::MP::JsonPrettify);
-    UtilTable.set_function("JsonMinify", &LuaAPI::MP::JsonMinify);
-    UtilTable.set_function("Random", [this] {
-        return mUniformRealDistribution01(mMersenneTwister);
-    });
-    UtilTable.set_function("RandomRange", [this](double min, double max) -> double {
-        return std::uniform_real_distribution(min, max)(mMersenneTwister);
-    });
-    UtilTable.set_function("RandomIntRange", [this](int64_t min, int64_t max) -> int64_t {
-        return std::uniform_int_distribution(min, max)(mMersenneTwister);
-    });
-
     auto HttpTable = StateView.create_named_table("Http");
     HttpTable.set_function("CreateConnection", [this](const std::string& host, uint16_t port) {
         return Lua_HttpCreateConnection(host, port);
@@ -842,13 +568,7 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
     FSTable.set_function("IsDirectory", &LuaAPI::FS::IsDirectory);
     FSTable.set_function("IsFile", &LuaAPI::FS::IsFile);
     FSTable.set_function("ConcatPaths", &LuaAPI::FS::ConcatPaths);
-    FSTable.set_function("ListFiles", [this](const std::string& Path) {
+    Start();
-        return Lua_FS_ListFiles(Path);
-    });
-    FSTable.set_function("ListDirectories", [this](const std::string& Path) {
-        return Lua_FS_ListDirectories(Path);
-    });
-    mThread = boost::scoped_thread<>(&StateThreadData::Start, this);
 }
 
 std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueScript(const TLuaChunk& Script) {
@@ -894,9 +614,9 @@ void TLuaEngine::StateThreadData::RegisterEvent(const std::string& EventName, co
     mEngine->RegisterEvent(EventName, mStateId, FunctionName);
 }
 
-void TLuaEngine::StateThreadData::Start() {
+void TLuaEngine::StateThreadData::operator()() {
     RegisterThread("Lua:" + mStateId);
-    while (!Application::IsShuttingDown()) {
+    while (!mShutdown) {
         { // StateExecuteQueue Scope
             std::unique_lock Lock(mStateExecuteQueueMutex);
             if (!mStateExecuteQueue.empty()) {
@@ -931,6 +651,7 @@ void TLuaEngine::StateThreadData::Start() {
                 }
                 sol::state_view StateView(mState);
                 auto Res = StateView.safe_script(*S.first.Content, sol::script_pass_on_error, S.first.FileName);
+                S.second->Ready = true;
                 if (Res.valid()) {
                     S.second->Error = false;
                     S.second->Result = std::move(Res);
@@ -939,7 +660,6 @@ void TLuaEngine::StateThreadData::Start() {
                     sol::error Err = Res;
                     S.second->ErrorMessage = Err.what();
                 }
-                S.second->MarkAsReady();
             }
         }
         { // StateFunctionQueue Scope
@@ -977,15 +697,6 @@ void TLuaEngine::StateThreadData::Start() {
                         case TLuaArgTypes_Bool:
                             LuaArgs.push_back(sol::make_object(StateView, std::get<bool>(Arg)));
                             break;
-                        case TLuaArgTypes_StringStringMap: {
-                            auto Map = std::get<std::unordered_map<std::string, std::string>>(Arg);
-                            auto Table = StateView.create_table();
-                            for (const auto& [k, v] : Map) {
-                                Table[k] = v;
-                            }
-                            LuaArgs.push_back(sol::make_object(StateView, Table));
-                            break;
-                        }
                         default:
                             beammp_error("Unknown argument type, passed as nil");
                             break;
@@ -1000,27 +711,17 @@ void TLuaEngine::StateThreadData::Start() {
                         sol::error Err = Res;
                         Result->ErrorMessage = Err.what();
                     }
-                    Result->MarkAsReady();
+                    Result->Ready = true;
                 } else {
                     Result->Error = true;
                     Result->ErrorMessage = BeamMPFnNotFoundError; // special error kind that we can ignore later
-                    Result->MarkAsReady();
+                    Result->Ready = true;
                 }
             }
         }
     }
 }
 
-std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> TLuaEngine::StateThreadData::Debug_GetStateExecuteQueue() {
-    std::unique_lock Lock(mStateExecuteQueueMutex);
-    return mStateExecuteQueue;
-}
-
-std::vector<TLuaEngine::QueuedFunction> TLuaEngine::StateThreadData::Debug_GetStateFunctionQueue() {
-    std::unique_lock Lock(mStateFunctionQueueMutex);
-    return mStateFunctionQueue;
-}
-
 void TLuaEngine::CreateEventTimer(const std::string& EventName, TLuaStateId StateId, size_t IntervalMS, CallStrategy Strategy) {
     std::unique_lock Lock(mTimedEventsMutex);
     TimedEvent Event {
@@ -1054,19 +755,11 @@ void TLuaEngine::StateThreadData::AddPath(const fs::path& Path) {
     mPaths.push(Path);
 }
 
-void TLuaResult::MarkAsReady() {
-    {
-        std::lock_guard<std::mutex> readyLock(*this->ReadyMutex);
-        this->Ready = true;
-    }
-    this->ReadyCondition->notify_all();
-}
-
 void TLuaResult::WaitUntilReady() {
-    std::unique_lock readyLock(*this->ReadyMutex);
+    while (!Ready) {
-    // wait if not ready yet
+        std::this_thread::yield();
-    if (!this->Ready)
+        std::this_thread::sleep_for(std::chrono::milliseconds(10));
-        this->ReadyCondition->wait(readyLock);
+    }
 }
 
 TLuaChunk::TLuaChunk(std::shared_ptr<std::string> Content, std::string FileName, std::string PluginPath)
@@ -1083,3 +776,60 @@ bool TLuaEngine::TimedEvent::Expired() {
 void TLuaEngine::TimedEvent::Reset() {
     LastCompletion = std::chrono::high_resolution_clock::now();
 }
+
+TPluginMonitor::TPluginMonitor(const fs::path& Path, TLuaEngine& Engine, std::atomic_bool& Shutdown)
+    : mEngine(Engine)
+    , mPath(Path)
+    , mShutdown(Shutdown) {
+    if (!fs::exists(mPath)) {
+        fs::create_directories(mPath);
+    }
+    for (const auto& Entry : fs::recursive_directory_iterator(mPath)) {
+        // TODO: trigger an event when a subfolder file changes
+        if (Entry.is_regular_file()) {
+            mFileTimes[Entry.path().string()] = fs::last_write_time(Entry.path());
+        }
+    }
+    Start();
+}
+
+void TPluginMonitor::operator()() {
+    RegisterThread("PluginMonitor");
+    beammp_info("PluginMonitor started");
+    while (!mShutdown) {
+        std::this_thread::sleep_for(std::chrono::seconds(3));
+        for (const auto& Pair : mFileTimes) {
+            auto CurrentTime = fs::last_write_time(Pair.first);
+            if (CurrentTime != Pair.second) {
+                mFileTimes[Pair.first] = CurrentTime;
+                // grandparent of the path should be Resources/Server
+                if (fs::equivalent(fs::path(Pair.first).parent_path().parent_path(), mPath)) {
+                    beammp_info("File \"" + Pair.first + "\" changed, reloading");
+                    // is in root folder, so reload
+                    std::ifstream FileStream(Pair.first, std::ios::in | std::ios::binary);
+                    auto Size = std::filesystem::file_size(Pair.first);
+                    auto Contents = std::make_shared<std::string>();
+                    Contents->resize(Size);
+                    FileStream.read(Contents->data(), Contents->size());
+                    TLuaChunk Chunk(Contents, Pair.first, fs::path(Pair.first).parent_path().string());
+                    auto StateID = mEngine.GetStateIDForPlugin(fs::path(Pair.first).parent_path());
+                    auto Res = mEngine.EnqueueScript(StateID, Chunk);
+                    // TODO: call onInit
+                    mEngine.AddResultToCheck(Res);
+                } else {
+                    // TODO: trigger onFileChanged event
+                    beammp_trace("Change detected in file \"" + Pair.first + "\", event trigger not implemented yet");
+                    /*
+                    // is in subfolder, dont reload, just trigger an event
+                    auto Results = mEngine.TriggerEvent("onFileChanged", "", Pair.first);
+                    mEngine.WaitForAll(Results);
+                    for (const auto& Result : Results)  {
+                        if (Result->Error) {
+                            beammp_lua_error(Result->ErrorMessage);
+                        }
+                    }*/
+                }
+            }
+        }
+    }
+}

src/TNetwork.cpp

@@ -0,0 +1,982 @@
+#include "TNetwork.h"
+#include "Client.h"
+#include "LuaAPI.h"
+#include "TLuaEngine.h"
+#include <CustomAssert.h>
+#include <Http.h>
+#include <array>
+#include <cstring>
+
+TNetwork::TNetwork(TServer& Server, TPPSMonitor& PPSMonitor, TResourceManager& ResourceManager)
+    : mServer(Server)
+    , mPPSMonitor(PPSMonitor)
+    , 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()) {
+            mShutdown = true;
+            mUDPThread.detach();
+        }
+        Application::SetSubsystemStatus("UDPNetwork", Application::Status::Shutdown);
+    });
+    Application::RegisterShutdownHandler([&] {
+        Application::SetSubsystemStatus("TCPNetwork", Application::Status::ShuttingDown);
+        if (mTCPThread.joinable()) {
+            mShutdown = true;
+            mTCPThread.detach();
+        }
+        Application::SetSubsystemStatus("TCPNetwork", Application::Status::Shutdown);
+    });
+    mTCPThread = std::thread(&TNetwork::TCPServerMain, this);
+    mUDPThread = std::thread(&TNetwork::UDPServerMain, this);
+}
+
+void TNetwork::UDPServerMain() {
+    RegisterThread("UDPServer");
+#if defined(BEAMMP_WINDOWS)
+    WSADATA data;
+    if (WSAStartup(514, &data)) {
+        beammp_error(("Can't start Winsock!"));
+        // return;
+    }
+#endif // WINDOWS
+    mUDPSock = socket(AF_INET, SOCK_DGRAM, 0);
+    // Create a server hint structure for the server
+    sockaddr_in serverAddr {};
+    serverAddr.sin_addr.s_addr = INADDR_ANY; // Any Local
+    serverAddr.sin_family = AF_INET; // Address format is IPv4
+    serverAddr.sin_port = htons(uint16_t(Application::Settings.Port)); // Convert from little to big endian
+
+    // Try and bind the socket to the IP and port
+    if (bind(mUDPSock, (sockaddr*)&serverAddr, sizeof(serverAddr)) != 0) {
+        beammp_error("bind() failed: " + GetPlatformAgnosticErrorString());
+        std::this_thread::sleep_for(std::chrono::seconds(5));
+        exit(-1); // TODO: Wtf.
+        // return;
+    }
+    Application::SetSubsystemStatus("UDPNetwork", Application::Status::Good);
+    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 (!mShutdown) {
+        try {
+            sockaddr_in client {};
+            std::string Data = UDPRcvFromClient(client); // Receives any data from Socket
+            size_t Pos = Data.find(':');
+            if (Data.empty() || Pos > 2)
+                continue;
+            /*char clientIp[256];
+            ZeroMemory(clientIp, 256); ///Code to get IP we don't need that yet
+            inet_ntop(AF_INET, &client.sin_addr, clientIp, 256);*/
+            uint8_t ID = uint8_t(Data.at(0)) - 1;
+            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);
+                    TServer::GlobalParser(ClientPtr, Data.substr(2), mPPSMonitor, *this);
+                }
+
+                return true;
+            });
+        } catch (const std::exception& e) {
+            beammp_error(("fatal: ") + std::string(e.what()));
+        }
+    }
+}
+
+void TNetwork::TCPServerMain() {
+    RegisterThread("TCPServer");
+#if defined(BEAMMP_WINDOWS)
+    WSADATA wsaData;
+    if (WSAStartup(514, &wsaData)) {
+        beammp_error("Can't start Winsock!");
+        return;
+    }
+#endif // WINDOWS
+    TConnection client {};
+    SOCKET Listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    int optval = 1;
+#if defined(BEAMMP_WINDOWS)
+    const char* optval_ptr = reinterpret_cast<const char*>(&optval);
+#elif defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
+    void* optval_ptr = reinterpret_cast<void*>(&optval);
+#endif
+    setsockopt(Listener, SOL_SOCKET, SO_REUSEADDR, optval_ptr, sizeof(optval));
+    // TODO: check optval or return value idk
+    sockaddr_in addr {};
+    addr.sin_addr.s_addr = INADDR_ANY;
+    addr.sin_family = AF_INET;
+    addr.sin_port = htons(uint16_t(Application::Settings.Port));
+    if (bind(Listener, (sockaddr*)&addr, sizeof(addr)) != 0) {
+        beammp_error("bind() failed: " + GetPlatformAgnosticErrorString());
+        std::this_thread::sleep_for(std::chrono::seconds(5));
+        exit(-1); // TODO: Wtf.
+    }
+    if (Listener == -1) {
+        beammp_error("Invalid listening socket");
+        return;
+    }
+    if (listen(Listener, SOMAXCONN)) {
+        beammp_error("listen() failed: " + GetPlatformAgnosticErrorString());
+        // FIXME leak Listener
+        return;
+    }
+    Application::SetSubsystemStatus("TCPNetwork", Application::Status::Good);
+    beammp_info(("Vehicle event network online"));
+    do {
+        try {
+            if (mShutdown) {
+                beammp_debug("shutdown during TCP wait for accept loop");
+                break;
+            }
+            client.SockAddrLen = sizeof(client.SockAddr);
+            client.Socket = accept(Listener, &client.SockAddr, &client.SockAddrLen);
+            if (client.Socket == -1) {
+                beammp_warn(("Got an invalid client socket on connect! Skipping..."));
+                continue;
+            }
+            // set timeout (DWORD, aka uint32_t)
+            uint32_t SendTimeoutMS = 30 * 1000;
+#if defined(BEAMMP_WINDOWS)
+            int ret = ::setsockopt(client.Socket, SOL_SOCKET, SO_SNDTIMEO, reinterpret_cast<const char*>(&SendTimeoutMS), sizeof(SendTimeoutMS));
+#else // POSIX
+            struct timeval optval;
+            optval.tv_sec = (int)(SendTimeoutMS / 1000);
+            optval.tv_usec = (SendTimeoutMS % 1000) * 1000;
+            int ret = ::setsockopt(client.Socket, SOL_SOCKET, SO_SNDTIMEO, reinterpret_cast<void*>(&optval), sizeof(optval));
+#endif
+            if (ret < 0) {
+                throw std::runtime_error("setsockopt recv timeout: " + GetPlatformAgnosticErrorString());
+            }
+            std::thread ID(&TNetwork::Identify, this, client);
+            ID.detach(); // TODO: Add to a queue and attempt to join periodically
+        } catch (const std::exception& e) {
+            beammp_error(("fatal: ") + std::string(e.what()));
+        }
+    } while (client.Socket);
+
+    beammp_debug("all ok, arrived at " + std::string(__func__) + ":" + std::to_string(__LINE__));
+
+    CloseSocketProper(client.Socket);
+#ifdef BEAMMP_WINDOWS
+    CloseSocketProper(client.Socket);
+    WSACleanup();
+#endif // WINDOWS
+}
+
+#undef GetObject // Fixes Windows
+
+#include "Json.h"
+namespace json = rapidjson;
+
+void TNetwork::Identify(const TConnection& client) {
+    RegisterThreadAuto();
+    char Code;
+    if (recv(client.Socket, &Code, 1, 0) != 1) {
+        CloseSocketProper(client.Socket);
+        return;
+    }
+    if (Code == 'C') {
+        Authentication(client);
+    } else if (Code == 'D') {
+        HandleDownload(client.Socket);
+    } else if (Code == 'P') {
+#if defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
+        send(client.Socket, "P", 1, MSG_NOSIGNAL);
+#else
+        send(client.Socket, "P", 1, 0);
+#endif
+        CloseSocketProper(client.Socket);
+        return;
+    } else {
+        CloseSocketProper(client.Socket);
+    }
+}
+
+void TNetwork::HandleDownload(SOCKET TCPSock) {
+    char D;
+    if (recv(TCPSock, &D, 1, 0) != 1) {
+        CloseSocketProper(TCPSock);
+        return;
+    }
+    auto ID = uint8_t(D);
+    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(TCPSock);
+            }
+        }
+        return true;
+    });
+}
+
+void TNetwork::Authentication(const TConnection& ClientConnection) {
+    auto Client = CreateClient(ClientConnection.Socket);
+    char AddrBuf[64];
+    // TODO: IPv6 would need this to be changed
+    auto str = inet_ntop(AF_INET, reinterpret_cast<const void*>(&ClientConnection.SockAddr), AddrBuf, sizeof(ClientConnection.SockAddr));
+    beammp_trace("This thread is ip " + std::string(str));
+    Client->SetIdentifier("ip", str);
+
+    std::string Rc; // TODO: figure out why this is not default constructed
+    beammp_info("Identifying new ClientConnection...");
+
+    Rc = TCPRcv(*Client);
+
+    if (Rc.size() > 3 && Rc.substr(0, 2) == "VC") {
+        Rc = Rc.substr(2);
+        if (Rc.length() > 4 || Rc != Application::ClientVersionString()) {
+            ClientKick(*Client, "Outdated Version!");
+            return;
+        }
+    } else {
+        ClientKick(*Client, "Invalid version header!");
+        return;
+    }
+    if (!TCPSend(*Client, "S")) {
+        // TODO: handle
+    }
+
+    Rc = TCPRcv(*Client);
+
+    if (Rc.size() > 50) {
+        ClientKick(*Client, "Invalid Key!");
+        return;
+    }
+
+    auto RequestString = R"({"key":")" + Rc + "\"}";
+
+    auto Target = "/pkToUser";
+    unsigned int ResponseCode = 0;
+    if (!Rc.empty()) {
+        Rc = Http::POST(Application::GetBackendUrlForAuth(), 443, Target, RequestString, "application/json", &ResponseCode);
+    }
+
+    json::Document AuthResponse;
+    AuthResponse.Parse(Rc.c_str());
+    if (Rc == Http::ErrorString || AuthResponse.HasParseError()) {
+        ClientKick(*Client, "Invalid key! Please restart your game.");
+        return;
+    }
+
+    if (!AuthResponse.IsObject()) {
+        if (Rc == "0") {
+            auto Lock = Sentry.CreateExclusiveContext();
+            Sentry.SetContext("auth",
+                { { "response-body", Rc },
+                    { "key", RequestString } });
+            Sentry.SetTransaction(Application::GetBackendUrlForAuth() + Target);
+            Sentry.Log(SentryLevel::Info, "default", "backend returned 0 instead of json (" + std::to_string(ResponseCode) + ")");
+        } else { // Rc != "0"
+            ClientKick(*Client, "Backend returned invalid auth response format.");
+            beammp_error("Backend returned invalid auth response format. This should never happen.");
+            auto Lock = Sentry.CreateExclusiveContext();
+            Sentry.SetContext("auth",
+                { { "response-body", Rc },
+                    { "key", RequestString } });
+            Sentry.SetTransaction(Application::GetBackendUrlForAuth() + Target);
+            Sentry.Log(SentryLevel::Error, "default", "unexpected backend response (" + std::to_string(ResponseCode) + ")");
+        }
+        return;
+    }
+
+    if (AuthResponse["username"].IsString() && AuthResponse["roles"].IsString()
+        && AuthResponse["guest"].IsBool() && AuthResponse["identifiers"].IsArray()) {
+
+        Client->SetName(AuthResponse["username"].GetString());
+        Client->SetRoles(AuthResponse["roles"].GetString());
+        Client->SetIsGuest(AuthResponse["guest"].GetBool());
+        for (const auto& ID : AuthResponse["identifiers"].GetArray()) {
+            auto Raw = std::string(ID.GetString());
+            auto SepIndex = Raw.find(':');
+            Client->SetIdentifier(Raw.substr(0, SepIndex), Raw.substr(SepIndex + 1));
+        }
+    } else {
+        ClientKick(*Client, "Invalid authentication data!");
+        return;
+    }
+
+    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()) {
+            CloseSocketProper(Cl->GetTCPSock());
+            Cl->SetStatus(-2);
+            return false;
+        }
+
+        return true;
+    });
+
+    auto Futures = LuaAPI::MP::Engine->TriggerEvent("onPlayerAuth", "", Client->GetName(), Client->GetRoles(), Client->IsGuest());
+    TLuaEngine::WaitForAll(Futures);
+    bool NotAllowed = std::any_of(Futures.begin(), Futures.end(),
+        [](const std::shared_ptr<TLuaResult>& Result) {
+            return !Result->Error && Result->Result.is<int>() && bool(Result->Result.as<int>());
+        });
+    std::string Reason;
+    bool NotAllowedWithReason = std::any_of(Futures.begin(), Futures.end(),
+        [&Reason](const std::shared_ptr<TLuaResult>& Result) -> bool {
+            if (!Result->Error && Result->Result.is<std::string>()) {
+                Reason = Result->Result.as<std::string>();
+                return true;
+            }
+            return false;
+        });
+
+    if (NotAllowed) {
+        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!");
+}
+
+std::shared_ptr<TClient> TNetwork::CreateClient(SOCKET TCPSock) {
+    auto c = std::make_shared<TClient>(mServer);
+    c->SetTCPSock(TCPSock);
+    return c;
+}
+
+bool TNetwork::TCPSend(TClient& c, const std::string& Data, bool IsSync) {
+    if (!IsSync) {
+        if (c.IsSyncing()) {
+            if (!Data.empty()) {
+                if (Data.at(0) == 'O' || Data.at(0) == 'A' || Data.at(0) == 'C' || Data.at(0) == 'E') {
+                    c.EnqueuePacket(Data);
+                }
+            }
+            return true;
+        }
+    }
+
+    int32_t Size, Sent;
+    std::string Send(4, 0);
+    Size = int32_t(Data.size());
+    memcpy(&Send[0], &Size, sizeof(Size));
+    Send += Data;
+    Sent = 0;
+    Size += 4;
+    do {
+#if defined(BEAMMP_WINDOWS)
+        int32_t Temp = send(c.GetTCPSock(), &Send[Sent], Size - Sent, 0);
+#elif defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
+        int32_t Temp = send(c.GetTCPSock(), &Send[Sent], Size - Sent, MSG_NOSIGNAL);
+#endif
+        if (Temp == 0) {
+            beammp_debug("send() == 0: " + GetPlatformAgnosticErrorString());
+            if (c.GetStatus() > -1)
+                c.SetStatus(-1);
+            return false;
+        } else if (Temp < 0) {
+            beammp_debug("send() < 0: " + GetPlatformAgnosticErrorString()); // TODO fix it was spamming yet everyone stayed on the server
+            if (c.GetStatus() > -1)
+                c.SetStatus(-1);
+            CloseSocketProper(c.GetTCPSock());
+            return false;
+        }
+        Sent += Temp;
+        c.UpdatePingTime();
+    } while (Sent < Size);
+    return true;
+}
+
+bool TNetwork::CheckBytes(TClient& c, int32_t BytesRcv) {
+    if (BytesRcv == 0) {
+        beammp_trace("(TCP) Connection closing...");
+        if (c.GetStatus() > -1)
+            c.SetStatus(-1);
+        return false;
+    } else if (BytesRcv < 0) {
+        beammp_debug("(TCP) recv() failed: " + GetPlatformAgnosticErrorString());
+        if (c.GetStatus() > -1)
+            c.SetStatus(-1);
+        CloseSocketProper(c.GetTCPSock());
+        return false;
+    }
+    return true;
+}
+
+std::string TNetwork::TCPRcv(TClient& c) {
+    int32_t Header, BytesRcv = 0, Temp;
+    if (c.GetStatus() < 0)
+        return "";
+
+    std::vector<char> Data(sizeof(Header));
+    do {
+        Temp = recv(c.GetTCPSock(), &Data[BytesRcv], 4 - BytesRcv, 0);
+        if (!CheckBytes(c, Temp)) {
+            return "";
+        }
+        BytesRcv += Temp;
+    } while (size_t(BytesRcv) < sizeof(Header));
+    memcpy(&Header, &Data[0], sizeof(Header));
+
+    if (!CheckBytes(c, BytesRcv)) {
+        return "";
+    }
+    if (Header < 100 * MB) {
+        Data.resize(Header);
+    } else {
+        ClientKick(c, "Header size limit exceeded");
+        beammp_warn("Client " + c.GetName() + " (" + std::to_string(c.GetID()) + ") sent header of >100MB - assuming malicious intent and disconnecting the client.");
+        return "";
+    }
+    BytesRcv = 0;
+    do {
+        Temp = recv(c.GetTCPSock(), &Data[BytesRcv], Header - BytesRcv, 0);
+        if (!CheckBytes(c, Temp)) {
+            return "";
+        }
+        BytesRcv += Temp;
+    } while (BytesRcv < Header);
+    std::string Ret(Data.data(), Header);
+
+    if (Ret.substr(0, 4) == "ABG:") {
+        Ret = DeComp(Ret.substr(4));
+    }
+    return Ret;
+}
+
+void TNetwork::ClientKick(TClient& c, const std::string& R) {
+    beammp_info("Client kicked: " + R);
+    if (!TCPSend(c, "K" + R)) {
+        // TODO handle
+    }
+    c.SetStatus(-2);
+
+    if (c.GetTCPSock())
+        CloseSocketProper(c.GetTCPSock());
+
+    if (c.GetDownSock())
+        CloseSocketProper(c.GetDownSock());
+}
+
+void TNetwork::Looper(const std::weak_ptr<TClient>& c) {
+    RegisterThreadAuto();
+    while (!c.expired()) {
+        auto Client = c.lock();
+        if (Client->GetStatus() < 0) {
+            beammp_debug("client status < 0, breaking client loop");
+            break;
+        }
+        if (!Client->IsSyncing() && Client->IsSynced() && Client->MissedPacketQueueSize() != 0) {
+            // debug("sending " + std::to_string(Client->MissedPacketQueueSize()) + " queued packets");
+            while (Client->MissedPacketQueueSize() > 0) {
+                std::string QData {};
+                { // locked context
+                    std::unique_lock lock(Client->MissedPacketQueueMutex());
+                    if (Client->MissedPacketQueueSize() <= 0) {
+                        break;
+                    }
+                    QData = Client->MissedPacketQueue().front();
+                    Client->MissedPacketQueue().pop();
+                } // end locked context
+                // beammp_debug("sending a missed packet: " + QData);
+                if (!TCPSend(*Client, QData, true)) {
+                    if (Client->GetStatus() > -1)
+                        Client->SetStatus(-1);
+                    {
+                        std::unique_lock lock(Client->MissedPacketQueueMutex());
+                        while (!Client->MissedPacketQueue().empty()) {
+                            Client->MissedPacketQueue().pop();
+                        }
+                    }
+                    CloseSocketProper(Client->GetTCPSock());
+                    break;
+                }
+            }
+        } else {
+            std::this_thread::sleep_for(std::chrono::milliseconds(1));
+        }
+    }
+}
+
+void TNetwork::TCPClient(const std::weak_ptr<TClient>& c) {
+    // TODO: the c.expired() might cause issues here, remove if you end up here with your debugger
+    if (c.expired() || c.lock()->GetTCPSock() == -1) {
+        mServer.RemoveClient(c);
+        return;
+    }
+    OnConnect(c);
+    RegisterThread("(" + std::to_string(c.lock()->GetID()) + ") \"" + c.lock()->GetName() + "\"");
+
+    std::thread QueueSync(&TNetwork::Looper, this, c);
+
+    while (true) {
+        if (c.expired())
+            break;
+        auto Client = c.lock();
+        if (Client->GetStatus() < 0) {
+            beammp_debug("client status < 0, breaking client loop");
+            break;
+        }
+
+        auto res = TCPRcv(*Client);
+        if (res == "") {
+            beammp_debug("TCPRcv error, break client loop");
+            break;
+        }
+        TServer::GlobalParser(c, res, mPPSMonitor, *this);
+    }
+    if (QueueSync.joinable())
+        QueueSync.join();
+
+    if (!c.expired()) {
+        auto Client = c.lock();
+        OnDisconnect(c, Client->GetStatus() == -2);
+    } else {
+        beammp_warn("client expired in TCPClient, should never happen");
+    }
+}
+
+void TNetwork::UpdatePlayer(TClient& Client) {
+    std::string Packet = ("Ss") + std::to_string(mServer.ClientCount()) + "/" + std::to_string(Application::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(Packet);
+    //(void)Respond(Client, Packet, true);
+}
+
+void TNetwork::OnDisconnect(const std::weak_ptr<TClient>& ClientPtr, bool kicked) {
+    beammp_assert(!ClientPtr.expired());
+    auto LockedClientPtr = ClientPtr.lock();
+    TClient& c = *LockedClientPtr;
+    beammp_info(c.GetName() + (" Connection Terminated"));
+    std::string Packet;
+    TClient::TSetOfVehicleData VehicleData;
+    { // Vehicle Data Lock Scope
+        auto LockedData = c.GetAllCars();
+        VehicleData = *LockedData.VehicleData;
+    } // End Vehicle Data Lock Scope
+    for (auto& v : VehicleData) {
+        Packet = "Od:" + std::to_string(c.GetID()) + "-" + std::to_string(v.ID());
+        SendToAll(&c, Packet, false, true);
+    }
+    if (kicked)
+        Packet = ("L") + c.GetName() + (" was kicked!");
+    else
+        Packet = ("L") + c.GetName() + (" left the server!");
+    SendToAll(&c, Packet, false, true);
+    Packet.clear();
+    auto Futures = LuaAPI::MP::Engine->TriggerEvent("onPlayerDisconnect", "", c.GetID());
+    LuaAPI::MP::Engine->ReportErrors(Futures);
+    if (c.GetTCPSock())
+        CloseSocketProper(c.GetTCPSock());
+    if (c.GetDownSock())
+        CloseSocketProper(c.GetDownSock());
+    mServer.RemoveClient(ClientPtr);
+}
+
+int TNetwork::OpenID() {
+    int ID = 0;
+    bool found;
+    do {
+        found = true;
+        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;
+}
+
+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->GetStatus() < 0)
+        return;
+    (void)Respond(*LockedClient, "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()));
+}
+
+void TNetwork::SyncResources(TClient& c) {
+#ifndef DEBUG
+    try {
+#endif
+        if (!TCPSend(c, "P" + std::to_string(c.GetID()))) {
+            // TODO handle
+        }
+        std::string Data;
+        while (c.GetStatus() > -1) {
+            Data = TCPRcv(c);
+            if (Data == "Done")
+                break;
+            Parse(c, Data);
+        }
+#ifndef DEBUG
+    } catch (std::exception& e) {
+        beammp_error("Exception! : " + std::string(e.what()));
+        c.SetStatus(-1);
+    }
+#endif
+}
+
+void TNetwork::Parse(TClient& c, const std::string& Packet) {
+    if (Packet.empty())
+        return;
+    char Code = Packet.at(0), SubCode = 0;
+    if (Packet.length() > 1)
+        SubCode = Packet.at(1);
+    switch (Code) {
+    case 'f':
+        SendFile(c, Packet.substr(1));
+        return;
+    case 'S':
+        if (SubCode == 'R') {
+            beammp_debug("Sending Mod Info");
+            std::string ToSend = mResourceManager.FileList() + mResourceManager.FileSizes();
+            if (ToSend.empty())
+                ToSend = "-";
+            if (!TCPSend(c, ToSend)) {
+                // TODO: error
+            }
+        }
+        return;
+    default:
+        return;
+    }
+}
+
+void TNetwork::SendFile(TClient& c, const std::string& UnsafeName) {
+    beammp_info(c.GetName() + " requesting : " + UnsafeName.substr(UnsafeName.find_last_of('/')));
+
+    if (!fs::path(UnsafeName).has_filename()) {
+        if (!TCPSend(c, "CO")) {
+            // 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, "CO")) {
+            // TODO: handle
+        }
+        beammp_warn("File " + UnsafeName + " could not be accessed!");
+        return;
+    }
+
+    if (!TCPSend(c, "AG")) {
+        // TODO: handle
+    }
+
+    /// Wait for connections
+    int T = 0;
+    while (c.GetDownSock() < 1 && T < 50) {
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+        T++;
+    }
+
+    if (c.GetDownSock() < 1) {
+        beammp_error("Client doesn't have a download socket!");
+        if (c.GetStatus() > -1)
+            c.SetStatus(-1);
+        return;
+    }
+
+    size_t Size = size_t(std::filesystem::file_size(FileName)), MSize = Size / 2;
+
+    std::thread SplitThreads[2] {
+        std::thread([&] {
+            RegisterThread("SplitLoad_0");
+            SplitLoad(c, 0, MSize, false, FileName);
+        }),
+        std::thread([&] {
+            RegisterThread("SplitLoad_1");
+            SplitLoad(c, MSize, Size, true, FileName);
+        })
+    };
+
+    for (auto& SplitThread : SplitThreads) {
+        if (SplitThread.joinable()) {
+            SplitThread.join();
+        }
+    }
+}
+
+void TNetwork::SplitLoad(TClient& c, size_t Sent, size_t Size, bool D, const std::string& Name) {
+    std::ifstream f(Name.c_str(), std::ios::binary);
+    uint32_t Split = 0x7735940; // 125MB
+    std::vector<char> Data;
+    if (Size > Split)
+        Data.resize(Split);
+    else
+        Data.resize(Size);
+    SOCKET TCPSock;
+    if (D)
+        TCPSock = c.GetDownSock();
+    else
+        TCPSock = c.GetTCPSock();
+    beammp_debug("Split load Socket " + std::to_string(TCPSock));
+    while (c.GetStatus() > -1 && Sent < Size) {
+        size_t Diff = Size - Sent;
+        if (Diff > Split) {
+            f.seekg(Sent, std::ios_base::beg);
+            f.read(Data.data(), Split);
+            if (!TCPSendRaw(c, TCPSock, Data.data(), Split)) {
+                if (c.GetStatus() > -1)
+                    c.SetStatus(-1);
+                break;
+            }
+            Sent += Split;
+        } else {
+            f.seekg(Sent, std::ios_base::beg);
+            f.read(Data.data(), Diff);
+            if (!TCPSendRaw(c, TCPSock, Data.data(), int32_t(Diff))) {
+                if (c.GetStatus() > -1)
+                    c.SetStatus(-1);
+                break;
+            }
+            Sent += Diff;
+        }
+    }
+}
+
+bool TNetwork::TCPSendRaw(TClient& C, SOCKET socket, char* Data, int32_t Size) {
+    intmax_t Sent = 0;
+    do {
+#if defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
+        intmax_t Temp = send(socket, &Data[Sent], int(Size - Sent), MSG_NOSIGNAL);
+#else
+        intmax_t Temp = send(socket, &Data[Sent], int(Size - Sent), 0);
+#endif
+        if (Temp < 1) {
+            beammp_info("Socket Closed! " + std::to_string(socket));
+            CloseSocketProper(socket);
+            return false;
+        }
+        Sent += Temp;
+        C.UpdatePingTime();
+    } while (Sent < Size);
+    return true;
+}
+
+bool TNetwork::SendLarge(TClient& c, std::string Data, bool isSync) {
+    if (Data.length() > 400) {
+        std::string CMP(Comp(Data));
+        Data = "ABG:" + CMP;
+    }
+    return TCPSend(c, Data, isSync);
+}
+
+bool TNetwork::Respond(TClient& c, const std::string& MSG, bool Rel, bool isSync) {
+    char C = MSG.at(0);
+    if (Rel || C == 'W' || C == 'Y' || C == 'V' || C == 'E') {
+        if (C == 'O' || C == 'T' || MSG.length() > 1000) {
+            return SendLarge(c, MSG, isSync);
+        } else {
+            return TCPSend(c, MSG, isSync);
+        }
+    } else {
+        return UDPSend(c, MSG);
+    }
+}
+
+bool TNetwork::SyncClient(const std::weak_ptr<TClient>& c) {
+    if (c.expired()) {
+        return false;
+    }
+    auto LockedClient = c.lock();
+    if (LockedClient->IsSynced())
+        return true;
+    // Syncing, later set isSynced
+    // after syncing is done, we apply all packets they missed
+    if (!Respond(*LockedClient, ("Sn") + LockedClient->GetName(), true)) {
+        return false;
+    }
+    // ignore error
+    (void)SendToAll(LockedClient.get(), ("JWelcome ") + LockedClient->GetName() + "!", false, true);
+
+    LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onPlayerJoin", "", LockedClient->GetID()));
+    LockedClient->SetIsSyncing(true);
+    bool Return = false;
+    bool res = true;
+    mServer.ForEachClient([&](const 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();
+            VehicleData = *LockedData.VehicleData;
+        } // End Vehicle Data Lock Scope
+        if (client != LockedClient) {
+            for (auto& v : VehicleData) {
+                if (LockedClient->GetStatus() < 0) {
+                    Return = true;
+                    res = false;
+                    return false;
+                }
+                res = Respond(*LockedClient, v.Data(), true, true);
+            }
+        }
+
+        return true;
+    });
+    LockedClient->SetIsSyncing(false);
+    if (Return) {
+        return res;
+    }
+    LockedClient->SetIsSynced(true);
+    beammp_info(LockedClient->GetName() + (" is now synced!"));
+    return true;
+}
+
+void TNetwork::SendToAll(TClient* c, const std::string& Data, bool Self, bool Rel) {
+    if (!Self)
+        beammp_assert(c);
+    char C = Data.at(0);
+    bool ret = true;
+    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 (Self || Client.get() != c) {
+            if (Client->IsSynced() || Client->IsSyncing()) {
+                if (Rel || C == 'W' || C == 'Y' || C == 'V' || C == 'E') {
+                    if (C == 'O' || C == 'T' || Data.length() > 1000) {
+                        if (Data.length() > 400) {
+                            std::string CMP(Comp(Data));
+                            Client->EnqueuePacket("ABG:" + CMP);
+                        } else {
+                            Client->EnqueuePacket(Data);
+                        }
+                        // ret = SendLarge(*Client, Data);
+                    } else {
+                        Client->EnqueuePacket(Data);
+                        // ret = TCPSend(*Client, Data);
+                    }
+                } else {
+                    ret = UDPSend(*Client, Data);
+                }
+            }
+        }
+        return true;
+    });
+    if (!ret) {
+        // TODO: handle
+    }
+    return;
+}
+
+bool TNetwork::UDPSend(TClient& Client, std::string Data) const {
+    if (!Client.IsConnected() || Client.GetStatus() < 0) {
+        // this can happen if we try to send a packet to a client that is either
+        // 1. not yet fully connected, or
+        // 2. disconnected and not yet fully removed
+        // this is fine can can be ignored :^)
+        return true;
+    }
+    sockaddr_in Addr = Client.GetUDPAddr();
+    auto AddrSize = sizeof(Client.GetUDPAddr());
+    if (Data.length() > 400) {
+        std::string CMP(Comp(Data));
+        Data = "ABG:" + CMP;
+    }
+#ifdef WIN32
+    int sendOk;
+    int len = static_cast<int>(Data.size());
+#else
+    int64_t sendOk;
+    size_t len = Data.size();
+#endif // WIN32
+
+    sendOk = sendto(mUDPSock, Data.c_str(), len, 0, (sockaddr*)&Addr, int(AddrSize));
+    if (sendOk == -1) {
+        beammp_debug("(UDP) sendto() failed: " + GetPlatformAgnosticErrorString());
+        if (Client.GetStatus() > -1)
+            Client.SetStatus(-1);
+        return false;
+    } else if (sendOk == 0) {
+        beammp_debug(("(UDP) sendto() returned 0"));
+        if (Client.GetStatus() > -1)
+            Client.SetStatus(-1);
+        return false;
+    }
+    return true;
+}
+
+std::string TNetwork::UDPRcvFromClient(sockaddr_in& client) const {
+    size_t clientLength = sizeof(client);
+    std::array<char, 1024> Ret {};
+#ifdef WIN32
+    auto Rcv = recvfrom(mUDPSock, Ret.data(), int(Ret.size()), 0, (sockaddr*)&client, (int*)&clientLength);
+#else // unix
+    int64_t Rcv = recvfrom(mUDPSock, Ret.data(), Ret.size(), 0, (sockaddr*)&client, (socklen_t*)&clientLength);
+#endif // WIN32
+
+    if (Rcv == -1) {
+        beammp_error("(UDP) Error receiving from client! recvfrom() failed: " + GetPlatformAgnosticErrorString());
+        return "";
+    }
+    return std::string(Ret.begin(), Ret.begin() + Rcv);
+}

src/TPPSMonitor.cpp

@@ -0,0 +1,70 @@
+#include "TPPSMonitor.h"
+#include "Client.h"
+#include "TNetwork.h"
+
+TPPSMonitor::TPPSMonitor(TServer& Server)
+    : mServer(Server) {
+    Application::SetSubsystemStatus("PPSMonitor", Application::Status::Starting);
+    Application::SetPPS("-");
+    Application::RegisterShutdownHandler([&] {
+        Application::SetSubsystemStatus("PPSMonitor", Application::Status::ShuttingDown);
+        if (mThread.joinable()) {
+            beammp_debug("shutting down PPSMonitor");
+            mShutdown = true;
+            mThread.join();
+            beammp_debug("shut down PPSMonitor");
+        }
+        Application::SetSubsystemStatus("PPSMonitor", Application::Status::Shutdown);
+    });
+    Start();
+}
+void TPPSMonitor::operator()() {
+    RegisterThread("PPSMonitor");
+    while (!mNetwork) {
+        // hard(-ish) spin
+        std::this_thread::yield();
+    }
+    beammp_debug("PPSMonitor starting");
+    Application::SetSubsystemStatus("PPSMonitor", Application::Status::Good);
+    std::vector<std::shared_ptr<TClient>> TimedOutClients;
+    while (!mShutdown) {
+        std::this_thread::sleep_for(std::chrono::seconds(1));
+        int C = 0, V = 0;
+        if (mServer.ClientCount() == 0) {
+            Application::SetPPS("-");
+            continue;
+        }
+        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 += c->GetCarCount();
+            }
+            // kick on "no ping"
+            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)");
+        }
+        TimedOutClients.clear();
+        if (C == 0 || mInternalPPS == 0) {
+            Application::SetPPS("-");
+        } else {
+            int R = (mInternalPPS / C) / V;
+            Application::SetPPS(std::to_string(R));
+        }
+        mInternalPPS = 0;
+    }
+}

src/TPluginMonitor.cpp

@@ -1,76 +0,0 @@
-#include "TPluginMonitor.h"
-
-#include "TLuaEngine.h"
-#include <filesystem>
-
-TPluginMonitor::TPluginMonitor(const fs::path& Path, std::shared_ptr<TLuaEngine> Engine)
-    : mEngine(Engine)
-    , mPath(Path) {
-    Application::SetSubsystemStatus("PluginMonitor", Application::Status::Starting);
-    if (!fs::exists(mPath)) {
-        fs::create_directories(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());
-        }
-    }
-
-    Application::RegisterShutdownHandler([this] {
-        if (mThread.joinable()) {
-            mThread.join();
-        }
-    });
-
-    Start();
-}
-
-void TPluginMonitor::operator()() {
-    RegisterThread("PluginMonitor");
-    beammp_info("PluginMonitor started");
-    Application::SetSubsystemStatus("PluginMonitor", Application::Status::Good);
-    while (!Application::IsShuttingDown()) {
-        std::vector<std::string> ToRemove;
-        for (const auto& Pair : mFileTimes) {
-            try {
-                auto CurrentTime = fs::last_write_time(Pair.first);
-                if (CurrentTime > Pair.second) {
-                    mFileTimes[Pair.first] = CurrentTime;
-                    // grandparent of the path should be Resources/Server
-                    if (fs::equivalent(fs::path(Pair.first).parent_path().parent_path(), mPath)) {
-                        beammp_infof("File \"{}\" changed, reloading", Pair.first);
-                        // is in root folder, so reload
-                        std::ifstream FileStream(Pair.first, std::ios::in | std::ios::binary);
-                        auto Size = std::filesystem::file_size(Pair.first);
-                        auto Contents = std::make_shared<std::string>();
-                        Contents->resize(Size);
-                        FileStream.read(Contents->data(), Contents->size());
-                        TLuaChunk Chunk(Contents, Pair.first, fs::path(Pair.first).parent_path().string());
-                        auto StateID = mEngine->GetStateIDForPlugin(fs::path(Pair.first).parent_path());
-                        auto Res = mEngine->EnqueueScript(StateID, Chunk);
-                        Res->WaitUntilReady();
-                        if (Res->Error) {
-                            beammp_lua_errorf("Error while hot-reloading \"{}\": {}", Pair.first, Res->ErrorMessage);
-                        } else {
-                            mEngine->ReportErrors(mEngine->TriggerLocalEvent(StateID, "onInit"));
-                            mEngine->ReportErrors(mEngine->TriggerEvent("onFileChanged", "", Pair.first));
-                        }
-                    } else {
-                        // is in subfolder, dont reload, just trigger an event
-                        beammp_debugf("File \"{}\" changed, not reloading because it's in a subdirectory. Triggering 'onFileChanged' event instead", Pair.first);
-                        mEngine->ReportErrors(mEngine->TriggerEvent("onFileChanged", "", Pair.first));
-                    }
-                }
-            } catch (const std::exception& e) {
-                ToRemove.push_back(Pair.first);
-            }
-        }
-        Application::SleepSafeSeconds(3);
-        for (const auto& File : ToRemove) {
-            mFileTimes.erase(File);
-            beammp_warnf("File \"{}\" couldn't be accessed, so it was removed from plugin hot reload monitor (probably got deleted)", File);
-        }
-    }
-    Application::SetSubsystemStatus("PluginMonitor", Application::Status::Shutdown);
-}

src/TResourceManager.cpp

@@ -0,0 +1,35 @@
+#include "TResourceManager.h"
+
+#include <algorithm>
+#include <filesystem>
+
+namespace fs = std::filesystem;
+
+TResourceManager::TResourceManager() {
+    Application::SetSubsystemStatus("ResourceManager", Application::Status::Starting);
+    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 (mModsLoaded)
+        beammp_info("Loaded " + std::to_string(mModsLoaded) + " Mods");
+
+    Application::SetSubsystemStatus("ResourceManager", Application::Status::Good);
+}

src/TSentry.cpp

@@ -0,0 +1,138 @@
+#include "TSentry.h"
+#include "Common.h"
+
+#include <cstring>
+#include <sentry.h>
+#include <sstream>
+
+TSentry::TSentry() {
+    if (std::strlen(S_DSN) == 0) {
+        mValid = false;
+    } else {
+        mValid = true;
+        sentry_options_t* options = sentry_options_new();
+        sentry_options_set_dsn(options, S_DSN);
+        auto ReleaseString = "BeamMP-Server@" + Application::ServerVersionString();
+        sentry_options_set_symbolize_stacktraces(options, true);
+        sentry_options_set_release(options, ReleaseString.c_str());
+        sentry_options_set_max_breadcrumbs(options, 10);
+        sentry_init(options);
+    }
+}
+
+TSentry::~TSentry() {
+    if (mValid) {
+        sentry_close();
+    }
+}
+
+void TSentry::PrintWelcome() {
+    if (mValid) {
+        if (!Application::Settings.SendErrors) {
+            mValid = false;
+            if (Application::Settings.SendErrorsMessageEnabled) {
+                beammp_info("Opted out of error reporting (SendErrors), Sentry disabled.");
+            } else {
+                beammp_info("Sentry disabled");
+            }
+        } else {
+            if (Application::Settings.SendErrorsMessageEnabled) {
+                beammp_info("Sentry started! Reporting errors automatically. This sends data to the developers in case of errors and crashes. You can learn more, turn this message off or opt-out of this in the ServerConfig.toml.");
+            } else {
+                beammp_info("Sentry started");
+            }
+        }
+    } else {
+        if (Application::Settings.SendErrorsMessageEnabled) {
+            beammp_info("Sentry disabled in unofficial build. Automatic error reporting disabled.");
+        } else {
+            beammp_info("Sentry disabled in unofficial build");
+        }
+    }
+}
+
+void TSentry::SetupUser() {
+    if (!mValid) {
+        return;
+    }
+    Application::SetSubsystemStatus("Sentry", Application::Status::Good);
+    sentry_value_t user = sentry_value_new_object();
+    if (Application::Settings.Key.size() == 36) {
+        sentry_value_set_by_key(user, "id", sentry_value_new_string(Application::Settings.Key.c_str()));
+    } else {
+        sentry_value_set_by_key(user, "id", sentry_value_new_string("unauthenticated"));
+    }
+    sentry_set_user(user);
+}
+
+void TSentry::Log(SentryLevel level, const std::string& logger, const std::string& text) {
+    if (!mValid) {
+        return;
+    }
+    SetContext("threads", { { "thread-name", ThreadName(true) } });
+    auto Msg = sentry_value_new_message_event(sentry_level_t(level), logger.c_str(), text.c_str());
+    sentry_capture_event(Msg);
+    sentry_remove_transaction();
+}
+
+void TSentry::LogError(const std::string& text, const std::string& file, const std::string& line) {
+    if (!mValid) {
+        return;
+    }
+    SetTransaction(file + ":" + line);
+    Log(SentryLevel::Error, "default", file + ": " + text);
+}
+
+void TSentry::SetContext(const std::string& context_name, const std::unordered_map<std::string, std::string>& map) {
+    if (!mValid) {
+        return;
+    }
+    auto ctx = sentry_value_new_object();
+    for (const auto& pair : map) {
+        std::string key = pair.first;
+        if (key == "type") {
+            // `type` is reserved
+            key = "_type";
+        }
+        sentry_value_set_by_key(ctx, key.c_str(), sentry_value_new_string(pair.second.c_str()));
+    }
+    sentry_set_context(context_name.c_str(), ctx);
+}
+
+void TSentry::LogException(const std::exception& e, const std::string& file, const std::string& line) {
+    if (!mValid) {
+        return;
+    }
+    SetTransaction(file + ":" + line);
+    Log(SentryLevel::Fatal, "exceptions", std::string(e.what()) + " @ " + file + ":" + line);
+}
+
+void TSentry::LogAssert(const std::string& condition_string, const std::string& file, const std::string& line, const std::string& function) {
+    if (!mValid) {
+        return;
+    }
+    SetTransaction(file + ":" + line + ":" + function);
+    std::stringstream ss;
+    ss << "\"" << condition_string << "\" failed @ " << file << ":" << line;
+    Log(SentryLevel::Fatal, "asserts", ss.str());
+}
+
+void TSentry::AddErrorBreadcrumb(const std::string& msg, const std::string& file, const std::string& line) {
+    if (!mValid) {
+        return;
+    }
+    auto crumb = sentry_value_new_breadcrumb("default", (msg + " @ " + file + ":" + line).c_str());
+    sentry_value_set_by_key(crumb, "level", sentry_value_new_string("error"));
+    sentry_add_breadcrumb(crumb);
+}
+
+void TSentry::SetTransaction(const std::string& id) {
+    if (!mValid) {
+        return;
+    }
+    sentry_set_transaction(id.c_str());
+}
+
+std::unique_lock<std::mutex> TSentry::CreateExclusiveContext() {
+    return std::unique_lock<std::mutex>(mMutex);
+}

src/TServer.cpp

@@ -0,0 +1,375 @@
+#include "TServer.h"
+#include "Client.h"
+#include "Common.h"
+#include "TNetwork.h"
+#include "TPPSMonitor.h"
+#include <TLuaPlugin.h>
+#include <any>
+#include <sstream>
+
+#include <nlohmann/json.hpp>
+
+#include "LuaAPI.h"
+
+#undef GetObject // Fixes Windows
+
+#include "Json.h"
+
+TServer::TServer(const std::vector<std::string_view>& Arguments) {
+    beammp_info("BeamMP Server v" + Application::ServerVersionString());
+    Application::SetSubsystemStatus("Server", Application::Status::Starting);
+    if (Arguments.size() > 1) {
+        Application::Settings.CustomIP = Arguments[0];
+        size_t n = std::count(Application::Settings.CustomIP.begin(), Application::Settings.CustomIP.end(), '.');
+        auto p = Application::Settings.CustomIP.find_first_not_of(".0123456789");
+        if (p != std::string::npos || n != 3 || Application::Settings.CustomIP.substr(0, 3) == "127") {
+            Application::Settings.CustomIP.clear();
+            beammp_warn("IP Specified is invalid! Ignoring");
+        } else {
+            beammp_info("server started with custom IP");
+        }
+    }
+    Application::SetSubsystemStatus("Server", Application::Status::Good);
+}
+
+void TServer::RemoveClient(const std::weak_ptr<TClient>& WeakClientPtr) {
+    if (!WeakClientPtr.expired()) {
+        TClient& Client = *WeakClientPtr.lock();
+        beammp_debug("removing client " + Client.GetName() + " (" + std::to_string(ClientCount()) + ")");
+        Client.ClearCars();
+        WriteLock Lock(mClientsMutex);
+        mClients.erase(WeakClientPtr.lock());
+    }
+}
+
+std::weak_ptr<TClient> TServer::InsertNewClient() {
+    beammp_debug("inserting new client (" + std::to_string(ClientCount()) + ")");
+    WriteLock Lock(mClientsMutex);
+    auto [Iter, Replaced] = mClients.insert(std::make_shared<TClient>(*this));
+    return *Iter;
+}
+
+void TServer::ForEachClient(const std::function<bool(std::weak_ptr<TClient>)>& Fn) {
+    decltype(mClients) Clients;
+    {
+        ReadLock lock(mClientsMutex);
+        Clients = mClients;
+    }
+    for (auto& Client : Clients) {
+        if (!Fn(Client)) {
+            break;
+        }
+    }
+}
+
+size_t TServer::ClientCount() const {
+    ReadLock Lock(mClientsMutex);
+    return mClients.size();
+}
+
+void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::string Packet, TPPSMonitor& PPSMonitor, TNetwork& Network) {
+    if (Packet.find("Zp") != std::string::npos && Packet.size() > 500) {
+        // abort();
+    }
+    if (Packet.substr(0, 4) == "ABG:") {
+        Packet = DeComp(Packet.substr(4));
+    }
+    if (Packet.empty()) {
+        return;
+    }
+
+    if (Client.expired()) {
+        return;
+    }
+    auto LockedClient = Client.lock();
+
+    std::any Res;
+    char Code = Packet.at(0);
+
+    // V to Z
+    if (Code <= 90 && Code >= 86) {
+        PPSMonitor.IncrementInternalPPS();
+        Network.SendToAll(LockedClient.get(), Packet, false, false);
+        return;
+    }
+    switch (Code) {
+    case 'H': // initial connection
+        beammp_trace(std::string("got 'H' packet: '") + Packet + "' (" + std::to_string(Packet.size()) + ")");
+        if (!Network.SyncClient(Client)) {
+            // TODO handle
+        }
+        return;
+    case 'p':
+        if (!Network.Respond(*LockedClient, ("p"), false)) {
+            // failed to send
+            if (LockedClient->GetStatus() > -1) {
+                LockedClient->SetStatus(-1);
+            }
+        } else {
+            Network.UpdatePlayer(*LockedClient);
+        }
+        return;
+    case 'O':
+        if (Packet.length() > 1000) {
+            beammp_debug(("Received data from: ") + LockedClient->GetName() + (" Size: ") + std::to_string(Packet.length()));
+        }
+        ParseVehicle(*LockedClient, Packet, Network);
+        return;
+    case 'J':
+        beammp_trace(std::string(("got 'J' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
+        Network.SendToAll(LockedClient.get(), Packet, false, true);
+        return;
+    case 'C': {
+        beammp_trace(std::string(("got 'C' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
+        if (Packet.length() < 4 || Packet.find(':', 3) == std::string::npos)
+            break;
+        auto Futures = LuaAPI::MP::Engine->TriggerEvent("onChatMessage", "", LockedClient->GetID(), LockedClient->GetName(), Packet.substr(Packet.find(':', 3) + 2));
+        TLuaEngine::WaitForAll(Futures);
+        LogChatMessage(LockedClient->GetName(), LockedClient->GetID(), Packet.substr(Packet.find(':', 3) + 1)); // FIXME: this needs to be adjusted once lua is merged
+        if (std::any_of(Futures.begin(), Futures.end(),
+                [](const std::shared_ptr<TLuaResult>& Elem) {
+                    return !Elem->Error
+                        && Elem->Result.is<int>()
+                        && bool(Elem->Result.as<int>());
+                })) {
+            break;
+        }
+        Network.SendToAll(nullptr, Packet, true, true);
+        return;
+    }
+    case 'E':
+        beammp_trace(std::string(("got 'E' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
+        HandleEvent(*LockedClient, Packet);
+        return;
+    case 'N':
+        beammp_trace("got 'N' packet (" + std::to_string(Packet.size()) + ")");
+        Network.SendToAll(LockedClient.get(), Packet, false, true);
+        return;
+    default:
+        return;
+    }
+}
+
+void TServer::HandleEvent(TClient& c, const std::string& Data) {
+    std::stringstream ss(Data);
+    std::string t, Name;
+    int a = 0;
+    while (std::getline(ss, t, ':')) {
+        switch (a) {
+        case 1:
+            Name = t;
+            break;
+        case 2:
+            LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent(Name, "", c.GetID(), t));
+            break;
+        default:
+            break;
+        }
+        if (a == 2)
+            break;
+        a++;
+    }
+}
+bool TServer::IsUnicycle(TClient& c, const std::string& CarJson) {
+    try {
+        auto Car = nlohmann::json::parse(CarJson);
+        const std::string jbm = "jbm";
+        if (Car.contains(jbm) && Car[jbm].is_string() && Car[jbm] == "unicycle") {
+            return true;
+        }
+    } catch (const std::exception& e) {
+        beammp_error("Failed to parse vehicle data as json for client " + std::to_string(c.GetID()) + ": '" + CarJson + "'");
+    }
+    return false;
+}
+
+bool TServer::ShouldSpawn(TClient& c, const std::string& CarJson, int ID) {
+    if (IsUnicycle(c, CarJson) && c.GetUnicycleID() < 0) {
+        c.SetUnicycleID(ID);
+        return true;
+    } else {
+        return c.GetCarCount() < Application::Settings.MaxCars;
+    }
+}
+
+void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Network) {
+    if (Pckt.length() < 4)
+        return;
+    std::string Packet = Pckt;
+    char Code = Packet.at(1);
+    int PID = -1;
+    int VID = -1, Pos;
+    std::string Data = Packet.substr(3), pid, vid;
+    switch (Code) { // Spawned Destroyed Switched/Moved NotFound Reset
+    case 's':
+        beammp_trace(std::string(("got 'Os' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
+        if (Data.at(0) == '0') {
+            int CarID = c.GetOpenCarID();
+            beammp_debug(c.GetName() + (" created a car with ID ") + std::to_string(CarID));
+
+            std::string CarJson = Packet.substr(5);
+            Packet = "Os:" + c.GetRoles() + ":" + c.GetName() + ":" + std::to_string(c.GetID()) + "-" + std::to_string(CarID) + ":" + CarJson;
+            auto Futures = LuaAPI::MP::Engine->TriggerEvent("onVehicleSpawn", "", c.GetID(), CarID, Packet.substr(3));
+            TLuaEngine::WaitForAll(Futures);
+            bool ShouldntSpawn = std::any_of(Futures.begin(), Futures.end(),
+                [](const std::shared_ptr<TLuaResult>& Result) {
+                    return !Result->Error && Result->Result.is<int>() && Result->Result.as<int>() != 0;
+                });
+
+            if (ShouldSpawn(c, CarJson, CarID) && !ShouldntSpawn) {
+                c.AddNewCar(CarID, Packet);
+                Network.SendToAll(nullptr, Packet, true, true);
+            } else {
+                if (!Network.Respond(c, Packet, true)) {
+                    // TODO: handle
+                }
+                std::string Destroy = "Od:" + std::to_string(c.GetID()) + "-" + std::to_string(CarID);
+                if (!Network.Respond(c, Destroy, true)) {
+                    // TODO: handle
+                }
+                beammp_debug(c.GetName() + (" (force : car limit/lua) removed ID ") + std::to_string(CarID));
+            }
+        }
+        return;
+    case 'c':
+        beammp_trace(std::string(("got 'Oc' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
+        pid = Data.substr(0, Data.find('-'));
+        vid = Data.substr(Data.find('-') + 1, Data.find(':', 1) - Data.find('-') - 1);
+        if (pid.find_first_not_of("0123456789") == std::string::npos && vid.find_first_not_of("0123456789") == std::string::npos) {
+            PID = stoi(pid);
+            VID = stoi(vid);
+        }
+        if (PID != -1 && VID != -1 && PID == c.GetID()) {
+            auto Futures = LuaAPI::MP::Engine->TriggerEvent("onVehicleEdited", "", c.GetID(), VID, Packet.substr(3));
+            TLuaEngine::WaitForAll(Futures);
+            bool ShouldntAllow = std::any_of(Futures.begin(), Futures.end(),
+                [](const std::shared_ptr<TLuaResult>& Result) {
+                    return !Result->Error && Result->Result.is<int>() && Result->Result.as<int>() != 0;
+                });
+
+            auto FoundPos = Packet.find('{');
+            FoundPos = FoundPos == std::string::npos ? 0 : FoundPos; // attempt at sanitizing this
+            if ((c.GetUnicycleID() != VID || IsUnicycle(c, Packet.substr(FoundPos)))
+                && !ShouldntAllow) {
+                Network.SendToAll(&c, Packet, false, true);
+                Apply(c, VID, Packet);
+            } else {
+                if (c.GetUnicycleID() == VID) {
+                    c.SetUnicycleID(-1);
+                }
+                std::string Destroy = "Od:" + std::to_string(c.GetID()) + "-" + std::to_string(VID);
+                if (!Network.Respond(c, Destroy, true)) {
+                    // TODO: handle
+                }
+                c.DeleteCar(VID);
+            }
+        }
+        return;
+    case 'd':
+        beammp_trace(std::string(("got 'Od' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
+        pid = Data.substr(0, Data.find('-'));
+        vid = Data.substr(Data.find('-') + 1);
+        if (pid.find_first_not_of("0123456789") == std::string::npos && vid.find_first_not_of("0123456789") == std::string::npos) {
+            PID = stoi(pid);
+            VID = stoi(vid);
+        }
+        if (PID != -1 && VID != -1 && PID == c.GetID()) {
+            if (c.GetUnicycleID() == VID) {
+                c.SetUnicycleID(-1);
+            }
+            Network.SendToAll(nullptr, Packet, true, true);
+            // TODO: should this trigger on all vehicle deletions?
+            LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehicleDeleted", "", c.GetID(), VID));
+            c.DeleteCar(VID);
+            beammp_debug(c.GetName() + (" deleted car with ID ") + std::to_string(VID));
+        }
+        return;
+    case 'r':
+        beammp_trace(std::string(("got 'Or' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
+        Pos = int(Data.find('-'));
+        pid = Data.substr(0, Pos++);
+        vid = Data.substr(Pos, Data.find(':') - Pos);
+
+        if (pid.find_first_not_of("0123456789") == std::string::npos && vid.find_first_not_of("0123456789") == std::string::npos) {
+            PID = stoi(pid);
+            VID = stoi(vid);
+        }
+
+        if (PID != -1 && VID != -1 && PID == c.GetID()) {
+            Data = Data.substr(Data.find('{'));
+            LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehicleReset", "", c.GetID(), VID, Data));
+            Network.SendToAll(&c, Packet, false, true);
+        }
+        return;
+    case 't':
+        beammp_trace(std::string(("got 'Ot' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
+        Network.SendToAll(&c, Packet, false, true);
+        return;
+    case 'm':
+        Network.SendToAll(&c, Packet, true, true);
+        return;
+    default:
+        beammp_trace(std::string(("possibly not implemented: '") + Packet + ("' (") + std::to_string(Packet.size()) + (")")));
+        return;
+    }
+}
+
+void TServer::Apply(TClient& c, int VID, const std::string& pckt) {
+    auto FoundPos = pckt.find('{');
+    if (FoundPos == std::string::npos) {
+        beammp_error("Malformed packet received, no '{' found");
+        return;
+    }
+    std::string Packet = pckt.substr(FoundPos);
+    std::string VD = c.GetCarData(VID);
+    if (VD.empty()) {
+        beammp_error("Tried to apply change to vehicle that does not exist");
+        auto Lock = Sentry.CreateExclusiveContext();
+        Sentry.SetContext("vehicle-change",
+            { { "packet", Packet },
+                { "vehicle-id", std::to_string(VID) },
+                { "client-car-count", std::to_string(c.GetCarCount()) } });
+        Sentry.LogError("attempt to apply change to nonexistent vehicle", _file_basename, _line);
+        return;
+    }
+    std::string Header = VD.substr(0, VD.find('{'));
+
+    FoundPos = VD.find('{');
+    if (FoundPos == std::string::npos) {
+        auto Lock = Sentry.CreateExclusiveContext();
+        Sentry.SetContext("vehicle-change-packet",
+            { { "packet", VD } });
+        Sentry.LogError("malformed packet", _file_basename, _line);
+        return;
+    }
+    VD = VD.substr(FoundPos);
+    rapidjson::Document Veh, Pack;
+    Veh.Parse(VD.c_str());
+    if (Veh.HasParseError()) {
+        beammp_error("Could not get vehicle config!");
+        return;
+    }
+    Pack.Parse(Packet.c_str());
+    if (Pack.HasParseError() || Pack.IsNull()) {
+        beammp_error("Could not get active vehicle config!");
+        return;
+    }
+
+    for (auto& M : Pack.GetObject()) {
+        if (Veh[M.name].IsNull()) {
+            Veh.AddMember(M.name, M.value, Veh.GetAllocator());
+        } else {
+            Veh[M.name] = Pack[M.name];
+        }
+    }
+    rapidjson::StringBuffer Buffer;
+    rapidjson::Writer<rapidjson::StringBuffer> writer(Buffer);
+    Veh.Accept(writer);
+    c.SetCarData(VID, Header + Buffer.GetString());
+}
+
+void TServer::InsertClient(const std::shared_ptr<TClient>& NewClient) {
+    beammp_debug("inserting client (" + std::to_string(ClientCount()) + ")");
+    WriteLock Lock(mClientsMutex); // TODO why is there 30+ threads locked here
+    (void)mClients.insert(NewClient);
+}

src/main.cpp

@@ -1,20 +1,23 @@
+#include "TSentry.h"
+
 #include "ArgsParser.h"
 #include "Common.h"
+#include "CustomAssert.h"
 #include "Http.h"
 #include "LuaAPI.h"
 #include "SignalHandling.h"
 #include "TConfig.h"
 #include "THeartbeatThread.h"
 #include "TLuaEngine.h"
-#include "TPluginMonitor.h"
+#include "TNetwork.h"
+#include "TPPSMonitor.h"
+#include "TResourceManager.h"
+#include "TScopedTimer.h"
+#include "TServer.h"
 
-#include <cstdlib>
 #include <iostream>
-#include <spdlog/sinks/rotating_file_sink.h>
-#include <spdlog/sinks/stdout_color_sinks.h>
-#include <spdlog/spdlog.h>
 #include <thread>
-
+#define CPPHTTPLIB_OPENSSL_SUPPORT 1
 static const std::string sCommandlineArguments = R"(
 USAGE: 
     BeamMP-Server [arguments]
@@ -41,6 +44,10 @@ EXAMPLES:
         'MyWestCoastServerConfig.toml'.
 )";
 
+// this is provided by the build system, leave empty for source builds
+// global, yes, this is ugly, no, it cant be done another way
+TSentry Sentry {};
+
 struct MainArguments {
     int argc {};
     char** argv {};
@@ -52,7 +59,7 @@ int BeamMPServerMain(MainArguments Arguments);
 
 int main(int argc, char** argv) {
     MainArguments Args { argc, argv, {}, argv[0] };
-    Args.List.reserve(size_t(argc));
+    Args.List.reserve(argc);
     for (int i = 1; i < argc; ++i) {
         Args.List.push_back(argv[i]);
     }
@@ -62,38 +69,15 @@ int main(int argc, char** argv) {
     } catch (const std::exception& e) {
         beammp_error("A fatal exception has occurred and the server is forcefully shutting down.");
         beammp_error(e.what());
+        Sentry.LogException(e, _file_basename, _line);
         MainRet = -1;
     }
-    std::exit(MainRet);
+    return MainRet;
-}
-
-static std::shared_ptr<spdlog::logger> default_logger;
-
-static void setup_logger() {
-    auto console_sink = std::make_shared<spdlog::sinks::stdout_color_sink_mt>();
-    console_sink->set_pattern("[%H:%M:%S] [%^%l%$] %v");
-    if (Application::Settings.DebugModeEnabled) {
-        console_sink->set_level(spdlog::level::debug);
-    } else {
-        console_sink->set_level(spdlog::level::info);
-    }
-
-    auto file_sink = std::make_shared<spdlog::sinks::rotating_file_sink_mt>("Launcher.log", 1024 * 1024, 3, true);
-    file_sink->set_level(spdlog::level::trace);
-    file_sink->set_pattern("[%H:%M:%S.%e] [%t] [%l] %v");
-
-    default_logger = std::make_shared<spdlog::logger>(spdlog::logger("default", { console_sink, file_sink }));
-
-    default_logger->set_level(spdlog::level::trace);
-    default_logger->flush_on(spdlog::level::trace);
-
-    spdlog::set_default_logger(default_logger);
-
-    spdlog::debug("Logger initialized");
 }
 
 int BeamMPServerMain(MainArguments Arguments) {
     setlocale(LC_ALL, "C");
+    Application::InitializeConsole();
     ArgsParser Parser;
     Parser.RegisterArgument({ "help" }, ArgsParser::NONE);
     Parser.RegisterArgument({ "version" }, ArgsParser::NONE);
@@ -104,26 +88,24 @@ int BeamMPServerMain(MainArguments Arguments) {
         return 1;
     }
     if (Parser.FoundArgument({ "help" })) {
+        Application::Console().Internal().set_prompt("");
         Application::Console().WriteRaw(sCommandlineArguments);
         return 0;
     }
     if (Parser.FoundArgument({ "version" })) {
+        Application::Console().Internal().set_prompt("");
         Application::Console().WriteRaw("BeamMP-Server v" + Application::ServerVersionString());
         return 0;
     }
 
-    // badly seed C's rng - this is only because rand() is used here and there for unimportant stuff
-    std::srand(std::time(0));
-
     std::string ConfigPath = "ServerConfig.toml";
     if (Parser.FoundArgument({ "config" })) {
         auto MaybeConfigPath = Parser.GetValueOfArgument({ "config" });
         if (MaybeConfigPath.has_value()) {
             ConfigPath = MaybeConfigPath.value();
-            // beammp_info("Custom config requested via commandline arguments: '" + ConfigPath + "'");
+            beammp_info("Custom config requested via commandline arguments: '" + ConfigPath + "'");
         }
     }
-    setup_logger();
     if (Parser.FoundArgument({ "working-directory" })) {
         auto MaybeWorkingDirectory = Parser.GetValueOfArgument({ "working-directory" });
         if (MaybeWorkingDirectory.has_value()) {
@@ -131,26 +113,15 @@ int BeamMPServerMain(MainArguments Arguments) {
             try {
                 fs::current_path(fs::path(MaybeWorkingDirectory.value()));
             } catch (const std::exception& e) {
-                beammp_errorf("Could not set working directory to '{}': {}", MaybeWorkingDirectory.value(), e.what());
+                beammp_error("Could not set working directory to '" + MaybeWorkingDirectory.value() + "': " + e.what());
             }
         }
     }
 
-    TConfig Config(ConfigPath);
-
-    if (Config.Failed()) {
-        beammp_info("Closing in 10 seconds");
-        // loop to make it possible to ctrl+c instead
-        for (size_t i = 0; i < 20; ++i) {
-            std::this_thread::sleep_for(std::chrono::milliseconds(500));
-        }
-        return 1;
-    }
-    Application::InitializeConsole();
-    Application::Console().StartLoggingToFile();
-
     Application::SetSubsystemStatus("Main", Application::Status::Starting);
 
+    Application::Console().StartLoggingToFile();
+
     SetupSignalHandlers();
 
     bool Shutdown = false;
@@ -164,20 +135,36 @@ int BeamMPServerMain(MainArguments Arguments) {
         TLuaEngine::WaitForAll(Futures, std::chrono::seconds(5));
     });
 
-    auto LuaEngine = std::make_shared<TLuaEngine>();
+    TServer Server(Arguments.List);
-    Application::Console().InitializeLuaConsole(*LuaEngine);
+    TConfig Config(ConfigPath);
+    TLuaEngine LuaEngine;
+    LuaEngine.SetServer(&Server);
+    Application::Console().InitializeLuaConsole(LuaEngine);
+
+    if (Config.Failed()) {
+        beammp_info("Closing in 10 seconds");
+        // loop to make it possible to ctrl+c instead
+        for (size_t i = 0; i < 20; ++i) {
+            std::this_thread::sleep_for(std::chrono::milliseconds(500));
+        }
+        return 1;
+    }
 
     RegisterThread("Main");
 
     beammp_trace("Running in debug mode on a debug build");
-    std::shared_ptr<Network> network = std::make_shared<Network>();
+    Sentry.SetupUser();
-    THeartbeatThread Heartbeat(network);
+    Sentry.PrintWelcome();
-    LuaEngine->SetNetwork(network);
+    TResourceManager ResourceManager;
+    TPPSMonitor PPSMonitor(Server);
+    THeartbeatThread Heartbeat(ResourceManager, Server);
+    TNetwork Network(Server, PPSMonitor, ResourceManager);
+    LuaEngine.SetNetwork(&Network);
+    PPSMonitor.SetNetwork(Network);
     Application::CheckForUpdates();
 
-    TPluginMonitor PluginMonitor(fs::path(Application::Settings.Resource) / "Server", LuaEngine);
-
     if (Application::Settings.HTTPServerEnabled) {
+        Http::Server::SetupEnvironment();
         Http::Server::THttpServerInstance HttpServerInstance {};
     }
 

test/test_main.cpp

@@ -1,22 +0,0 @@
-#define DOCTEST_CONFIG_IMPLEMENT
-#include <doctest/doctest.h>
-
-#include <Common.h>
-
-int main(int argc, char** argv) {
-    doctest::Context context;
-
-    // Application::InitializeConsole();
-
-    context.applyCommandLine(argc, argv);
-
-    int res = context.run(); // run
-
-    if (context.shouldExit()) // important - query flags (and --exit) rely on the user doing this
-        return res; // propagate the result of the tests
-
-    int client_stuff_return_code = 0;
-    // your program - if the testing framework is integrated in your production code
-
-    return res + client_stuff_return_code; // the result from doctest is propagated here as well
-}

vcpkg.json

@@ -1,24 +0,0 @@
-{
-  "name": "server",
-  "version-string": "0.1.0",
-  "dependencies": [
-    "boost-asio",
-    "boost-spirit",
-    "boost-uuid",
-    "boost-variant",
-    "boost-iostreams",
-    "cpp-httplib",
-    "doctest",
-    "fmt",
-    "nlohmann-json",
-    "openssl",
-    "rapidjson",
-    "sol2",
-    "toml11",
-    "zstd",
-    "glm",
-    "libzip",
-    "spdlog",
-    "readline"
-  ]
-}