implement GetOsName

wip onvehiclereset implemented
support onVehicleDeleted
2026-07-13 18:24:16 +00:00 · 2023-12-06 13:59:54 +01:00 · 2023-12-05 23:18:52 +01:00 · 2023-12-05 14:48:41 +01:00 · 2023-12-04 16:57:54 +01:00 · 2023-12-04 16:57:53 +01:00
91 changed files with 5887 additions and 7568 deletions
@@ -1,5 +0,0 @@
---
-BasedOnStyle: WebKit
-BreakBeforeBraces: Attach
-
-...
@@ -1,29 +0,0 @@
---
-name: Bug report
-about: Create a report to help us improve
-title: "[Bug] Enter issue title here"
-labels: bug
-assignees: ''
-
---
-
-**Fill out general information**
-OS (windows, linux, ...):
-BeamMP-Server Version:
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Do x ...
-2. Do y ...
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Logs**
-Please attach the `Server.log` from the run in which the issue appeared, preferably with Debug turned on in the `ServerConfig.toml`.
-
-**Additional context**
-Add any other context about the problem here.
@@ -1,20 +0,0 @@
---
-name: Feature request
-about: Suggest an idea for this project
-title: "[Feature Request]"
-labels: enhancement
-assignees: ''
-
---
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. For example: "I'm always frustrated when ...".
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen. Also supply OS information if relevant, for example "*On Linux*, I would like to be able to...".
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context about the feature request here.
@@ -1,44 +0,0 @@
-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
@@ -1,58 +0,0 @@
-name: CMake Windows Build
-
-on: [push]
-
-env:
-  BUILD_TYPE: Release
-
-jobs:
-  windows-build:
-    runs-on: windows-latest
-    
-    steps:
-      - uses: actions/checkout@v2
-        with:
-            submodules: 'recursive'
-      
-      - name: Restore artifacts, or run vcpkg, build and cache artifacts
-        uses: lukka/run-vcpkg@v7
-        id: runvcpkg
-        with:
-            vcpkgArguments: 'lua zlib rapidjson openssl websocketpp curl'
-            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
-
@@ -1,115 +0,0 @@
-name: Release Create & Build
-on:
-  push:
-    # Sequence of patterns matched against refs/tags
-    tags:
-    - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
-
-env:
-  BUILD_TYPE: Release
-
-jobs:
-  create-release:
-    runs-on: ubuntu-latest
-    name: Create Release
-    outputs: 
-      upload_url: ${{ steps.create_release.outputs.upload_url }} 
-    steps:
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: ${{ github.ref }}
-          draft: false
-          prerelease: true
-          body: |
-              Files included in this release:
-              - `BeamMP-Server.exe` is the windows build
-              - `BeamMP-Server-linux` is a ubuntu build, so you need the dependencies listed in README.md to run it. For any other distros please build from source as described in README.md.
-
-  upload-release-files-linux:
-    name: Upload Linux Release Files
-    runs-on: ubuntu-latest
-    needs: create-release
-    steps:
-      - uses: actions/checkout@v2
-        with:
-            submodules: 'recursive'
-
-      - name: Install Dependencies
-        run: |
-            sudo apt-get update
-            sudo apt-get install -y libz-dev rapidjson-dev liblua5.3 libssl-dev libwebsocketpp-dev libcurl4-openssl-dev
-
-      - name: Create Build Environment
-        run: cmake -E make_directory ${{github.workspace}}/build-linux
-
-      - name: Configure CMake
-        shell: bash
-        working-directory: ${{github.workspace}}/build-linux
-        env:
-          beammp_sentry_url: ${{ secrets.BEAMMP_SECRET_SENTRY_URL }}
-        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_COMPILER=g++-10 -DBEAMMP_SECRET_SENTRY_URL="$beammp_sentry_url"
-
-      - name: Build
-        working-directory: ${{github.workspace}}/build-linux
-        shell: bash
-        run: cmake --build . --config $BUILD_TYPE
-
-      - name: Upload Release Asset
-        id: upload-release-asset 
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.create-release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
-          asset_path: ${{github.workspace}}/build-linux/BeamMP-Server
-          asset_name: BeamMP-Server-linux
-          asset_content_type: application/x-elf
-
-  upload-release-files-windows:
-    name: Upload Windows Release Files
-    runs-on: windows-latest
-    needs: create-release
-    steps:
-      - uses: actions/checkout@v2
-        with:
-            submodules: 'recursive'
-      
-      - name: Restore artifacts, or run vcpkg, build and cache artifacts
-        uses: lukka/run-vcpkg@v7
-        id: runvcpkg
-        with:
-            vcpkgArguments: 'lua zlib rapidjson openssl websocketpp curl'
-            vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
-            vcpkgGitCommitId: 'a106de33bbee694e3be6243718aa2a549a692832'
-            vcpkgTriplet: 'x64-windows-static'
-
-      - name: Create Build Environment
-        run: cmake -E make_directory ${{github.workspace}}/build-windows
-
-      - name: Configure CMake
-        shell: bash
-        working-directory: ${{github.workspace}}/build-windows
-        env:
-          beammp_sentry_url: ${{ secrets.BEAMMP_SECRET_SENTRY_URL }}
-        run: cmake $GITHUB_WORKSPACE -DSENTRY_BACKEND=breakpad -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE='${{ runner.workspace }}/b/vcpkg/scripts/buildsystems/vcpkg.cmake' -DVCPKG_TARGET_TRIPLET=x64-windows-static -DBEAMMP_SECRET_SENTRY_URL="$beammp_sentry_url"
-
-      - name: Build
-        working-directory: ${{github.workspace}}/build-windows
-        shell: bash
-        run: cmake --build . --config $BUILD_TYPE
-
-      - name: Upload Release Asset
-        id: upload-release-asset 
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.create-release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
-          asset_path: ${{github.workspace}}/build-windows/Release/BeamMP-Server.exe
-          asset_name: BeamMP-Server.exe
-          asset_content_type: application/vnd.microsoft.portable-executable
@@ -0,0 +1,21 @@
+name: Rust
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build
+      run: cargo build --verbose
+    - name: Run tests
+      run: cargo test --verbose
@@ -1,481 +1,4 @@
-.idea/
-.sentry-native/
-*.orig
-*.toml
-boost_*
-Resources
-run-in-env.sh
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-##
-## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
-
-# User-specific files
-*.rsuser
-*.suo
-*.user
-*.userosscache
-*.sln.docstates
-
-# User-specific files (MonoDevelop/Xamarin Studio)
-*.userprefs
-
-# Mono auto generated files
-mono_crash.*
-
-#VS Files
-out/
-
-#Clion Files
-cmake-build-debug/
-cmake-build-release/
-.idea/
-# Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-x64/
-x86/
-[Aa][Rr][Mm]/
-[Aa][Rr][Mm]64/
-bld/
-[Bb]in/
-[Oo]bj/
-[Ll]og/
-[Ll]ogs/
-
-# Visual Studio 2015/2017 cache/options directory
-.vs/
-# Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
-# Visual Studio 2017 auto generated files
-Generated\ Files/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-# NUnit
-*.VisualState.xml
-TestResult.xml
-nunit-*.xml
-
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-# Benchmark Results
-BenchmarkDotNet.Artifacts/
-
-# .NET Core
-project.lock.json
-project.fragment.lock.json
-artifacts/
-
-# StyleCop
-StyleCopReport.xml
-
-# Files built by Visual Studio
-*_i.c
-*_p.c
-*_h.h
-*.ilk
-*.meta
-*.obj
-*.iobj
-*.pch
-*.pdb
-*.ipdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*_wpftmp.csproj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.svclog
-*.scc
-
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opendb
-*.opensdf
-*.sdf
-*.cachefile
-*.VC.db
-*.VC.VC.opendb
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-*.sap
-
-# Visual Studio Trace Files
-*.e2e
-
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# AxoCover is a Code Coverage Tool
-.axoCover/*
-!.axoCover/settings.json
-
-# Visual Studio code coverage results
-*.coverage
-*.coveragexml
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-nCrunchTemp_*
-
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-# Note: Comment the next line if you want to checkin your web deploy settings,
-# but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
-*.publishproj
-
-# Microsoft Azure Web App publish settings. Comment the next line if you want to
-# checkin your Azure Web App publish settings, but sensitive information contained
-# in these scripts will be unencrypted
-PublishScripts/
-
-# NuGet Packages
-*.nupkg
-# NuGet Symbol Packages
-*.snupkg
-# The packages folder can be ignored because of Package Restore
-**/[Pp]ackages/*
-# except build/, which is used as an MSBuild target.
-!**/[Pp]ackages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/[Pp]ackages/repositories.config
-# NuGet v3's project.json files produces more ignorable files
-*.nuget.props
-*.nuget.targets
-
-# Microsoft Azure Build Output
-csx/
-*.build.csdef
-
-# Microsoft Azure Emulator
-ecf/
-rcf/
-
-# Windows Store app package directories and files
-AppPackages/
-BundleArtifacts/
-Package.StoreAssociation.xml
-_pkginfo.txt
-*.appx
-*.appxbundle
-*.appxupload
-
-# Visual Studio cache files
-# files ending in .cache can be ignored
-*.[Cc]ache
-# but keep track of directories ending in .cache
-!?*.[Cc]ache/
-
-# Others
-ClientBin/
-~$*
-*~
-*.dbmdl
-*.dbproj.schemaview
-*.jfm
-*.pfx
-*.publishsettings
-orleans.codegen.cs
-
-# Including strong name files can present a security risk
-# (https://github.com/github/gitignore/pull/2483#issue-259490424)
-#*.snk
-
-# Since there are multiple workflows, uncomment next line to ignore bower_components
-# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
-#bower_components/
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-ServiceFabricBackup/
-*.rptproj.bak
-
-# SQL Server files
-*.mdf
-*.ldf
-*.ndf
-
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-*.rptproj.rsuser
-*- [Bb]ackup.rdl
-*- [Bb]ackup ([0-9]).rdl
-*- [Bb]ackup ([0-9][0-9]).rdl
-
-# Microsoft Fakes
-FakesAssemblies/
-
-# GhostDoc plugin setting file
-*.GhostDoc.xml
-
-# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
-node_modules/
-
-# Visual Studio 6 build log
-*.plg
-
-# Visual Studio 6 workspace options file
-*.opt
-
-# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
-*.vbw
-
-# Visual Studio LightSwitch build output
-**/*.HTMLClient/GeneratedArtifacts
-**/*.DesktopClient/GeneratedArtifacts
-**/*.DesktopClient/ModelManifest.xml
-**/*.Server/GeneratedArtifacts
-**/*.Server/ModelManifest.xml
-_Pvt_Extensions
-
-# Paket dependency manager
-.paket/paket.exe
-paket-files/
-
-# FAKE - F# Make
-.fake/
-
-# CodeRush personal settings
-.cr/personal
-
-# Python Tools for Visual Studio (PTVS)
-__pycache__/
-*.pyc
-
-# Cake - Uncomment if you are using it
-# tools/**
-# !tools/packages.config
-
-# Tabs Studio
-*.tss
-
-# Telerik's JustMock configuration file
-*.jmconfig
-
-# BizTalk build output
-*.btp.cs
-*.btm.cs
-*.odx.cs
-*.xsd.cs
-
-# OpenCover UI analysis results
-OpenCover/
-
-# Azure Stream Analytics local run output
-ASALocalRun/
-
-# MSBuild Binary and Structured Log
-*.binlog
-
-# NVidia Nsight GPU debugger configuration file
-*.nvuser
-
-# MFractors (Xamarin productivity tool) working folder
-.mfractor/
-
-# Local History for Visual Studio
-.localhistory/
-
-# BeatPulse healthcheck temp database
-healthchecksdb
-
-# Backup folder for Package Reference Convert tool in Visual Studio 2017
-MigrationBackup/
-
-# Ionide (cross platform F# VS Code tools) working folder
-.ionide/
-out/build/x86-Debug/VSInheritEnvironments.txt
-out/build/x86-Debug/rules.ninja
-out/build/x86-Debug/CMakeFiles/untitled.dir/manifest.res
-out/build/x86-Debug/CMakeFiles/untitled.dir/manifest.rc
-out/build/x86-Debug/CMakeFiles/untitled.dir/intermediate.manifest
-out/build/x86-Debug/CMakeFiles/untitled.dir/embed.manifest
-out/build/x86-Debug/CMakeFiles/TargetDirectories.txt
-out/build/x86-Debug/CMakeFiles/ShowIncludes/main.c
-out/build/x86-Debug/CMakeFiles/ShowIncludes/foo.h
-out/build/x86-Debug/CMakeFiles/cmake.check_cache
-out/build/x86-Debug/CMakeFiles/3.15.19101501-MSVC_2/CompilerIdCXX/CMakeCXXCompilerId.exe
-out/build/x86-Debug/CMakeFiles/3.15.19101501-MSVC_2/CompilerIdCXX/CMakeCXXCompilerId.cpp
-out/build/x86-Debug/CMakeFiles/3.15.19101501-MSVC_2/CompilerIdC/CMakeCCompilerId.exe
-out/build/x86-Debug/CMakeFiles/3.15.19101501-MSVC_2/CompilerIdC/CMakeCCompilerId.c
-out/build/x86-Debug/CMakeFiles/3.15.19101501-MSVC_2/CMakeSystem.cmake
-out/build/x86-Debug/CMakeFiles/3.15.19101501-MSVC_2/CMakeRCCompiler.cmake
-out/build/x86-Debug/CMakeFiles/3.15.19101501-MSVC_2/CMakeDetermineCompilerABI_CXX.bin
-out/build/x86-Debug/CMakeFiles/3.15.19101501-MSVC_2/CMakeDetermineCompilerABI_C.bin
-out/build/x86-Debug/CMakeFiles/3.15.19101501-MSVC_2/CMakeCXXCompiler.cmake
-out/build/x86-Debug/CMakeFiles/3.15.19101501-MSVC_2/CMakeCCompiler.cmake
-out/build/x86-Debug/CMakeCache.txt
-out/build/x86-Debug/cmake_install.cmake
-out/build/x86-Debug/build.ninja
-out/build/x86-Debug/.ninja_log
-out/build/x86-Debug/.ninja_deps
-out/build/x86-Debug/.cmake/api/v1/reply/target-untitled-Debug-03f16c5921ae0bd48990.json
-out/build/x86-Debug/.cmake/api/v1/reply/index-2020-01-27T23-42-34-0718.json
-out/build/x86-Debug/.cmake/api/v1/reply/codemodel-v2-2b93246ca751d7a49cd1.json
-out/build/x86-Debug/.cmake/api/v1/reply/cmakeFiles-v1-d93b224eb363971ee2c4.json
-out/build/x86-Debug/.cmake/api/v1/reply/cache-v2-43521627501184045d13.json
-out/build/x86-Debug/.cmake/api/v1/query/client-MicrosoftVS/query.json
-out/build/x64-Debug/VSInheritEnvironments.txt
-out/build/x64-Debug/rules.ninja
-out/build/x64-Debug/CMakeFiles/untitled.dir/manifest.res
-out/build/x64-Debug/CMakeFiles/untitled.dir/manifest.rc
-out/build/x64-Debug/CMakeFiles/untitled.dir/intermediate.manifest
-out/build/x64-Debug/CMakeFiles/untitled.dir/embed.manifest
-out/build/x64-Debug/CMakeFiles/TargetDirectories.txt
-out/build/x64-Debug/CMakeFiles/ShowIncludes/main.c
-out/build/x64-Debug/CMakeFiles/ShowIncludes/foo.h
-out/build/x64-Debug/CMakeFiles/cmake.check_cache
-out/build/x64-Debug/CMakeFiles/3.15.19101501-MSVC_2/CompilerIdCXX/CMakeCXXCompilerId.exe
-out/build/x64-Debug/CMakeFiles/3.15.19101501-MSVC_2/CompilerIdCXX/CMakeCXXCompilerId.cpp
-out/build/x64-Debug/CMakeFiles/3.15.19101501-MSVC_2/CompilerIdC/CMakeCCompilerId.exe
-out/build/x64-Debug/CMakeFiles/3.15.19101501-MSVC_2/CompilerIdC/CMakeCCompilerId.c
-out/build/x64-Debug/CMakeFiles/3.15.19101501-MSVC_2/CMakeSystem.cmake
-out/build/x64-Debug/CMakeFiles/3.15.19101501-MSVC_2/CMakeRCCompiler.cmake
-out/build/x64-Debug/CMakeFiles/3.15.19101501-MSVC_2/CMakeDetermineCompilerABI_CXX.bin
-out/build/x64-Debug/CMakeFiles/3.15.19101501-MSVC_2/CMakeDetermineCompilerABI_C.bin
-out/build/x64-Debug/CMakeFiles/3.15.19101501-MSVC_2/CMakeCXXCompiler.cmake
-out/build/x64-Debug/CMakeFiles/3.15.19101501-MSVC_2/CMakeCCompiler.cmake
-out/build/x64-Debug/CMakeCache.txt
-out/build/x64-Debug/cmake_install.cmake
-out/build/x64-Debug/build.ninja
-out/build/x64-Debug/.ninja_log
-out/build/x64-Debug/.ninja_deps
-out/build/x64-Debug/.cmake/api/v1/reply/target-untitled-Debug-8918286eee207fe0275b.json
-out/build/x64-Debug/.cmake/api/v1/reply/index-2020-01-27T23-42-03-0431.json
-out/build/x64-Debug/.cmake/api/v1/reply/codemodel-v2-ee254da00ecbf4b22928.json
-out/build/x64-Debug/.cmake/api/v1/reply/cmakeFiles-v1-ee926bd040d82c324cbe.json
-out/build/x64-Debug/.cmake/api/v1/reply/cache-v2-6f7cb0917968b934d35c.json
-out/build/x64-Debug/.cmake/api/v1/query/client-MicrosoftVS/query.json
-CMakeSettings.json
-cmake-build-debug/Resource1.resx
-out/build/x64-Debug/.cmake/api/v1/reply/index-2020-01-28T10-34-19-0746.json
-out/build/x64-Debug/untitled.exe
-out/build/x64-Debug/.cmake/api/v1/reply/index-2020-01-28T11-19-41-0061.json
-out/build/x64-Debug/.cmake/api/v1/reply/cmakeFiles-v1-52c1d9386071c1490278.json
-out/build/x86-Debug/CMakeFiles/cmake-main.dir/manifest.res
-out/build/x86-Debug/CMakeFiles/cmake-main.dir/manifest.rc
-out/build/x86-Debug/CMakeFiles/cmake-main.dir/intermediate.manifest
-out/build/x86-Debug/CMakeFiles/cmake-main.dir/embed.manifest
-out/build/x86-Debug/cmake-main.exe
-out/build/x86-Debug/.cmake/api/v1/reply/target-enet-Debug-1cc90e5d191bd520f961.json
-out/build/x86-Debug/.cmake/api/v1/reply/target-cmake-main-Debug-0c9bd3464adc40e447af.json
-out/build/x86-Debug/.cmake/api/v1/reply/index-2020-01-28T11-21-26-0362.json
-out/build/x86-Debug/.cmake/api/v1/reply/codemodel-v2-1850e17888d5bab56568.json
-out/build/x86-Debug/.cmake/api/v1/reply/cmakeFiles-v1-7c376457f6b736ad28ac.json
-out/build/x64-Debug/CMakeFiles/cmake-main.dir/manifest.res
-out/build/x64-Debug/CMakeFiles/cmake-main.dir/manifest.rc
-out/build/x64-Debug/CMakeFiles/cmake-main.dir/intermediate.manifest
-out/build/x64-Debug/CMakeFiles/cmake-main.dir/embed.manifest
-out/build/x64-Debug/cmake-main.exe
-out/build/x64-Debug/.cmake/api/v1/reply/target-enet-Debug-645fd45f5bd4fab53aa9.json
-out/build/x64-Debug/.cmake/api/v1/reply/target-cmake-main-Debug-b124668c8fb6ca5df286.json
-out/build/x64-Debug/.cmake/api/v1/reply/index-2020-01-28T11-21-06-0706.json
-out/build/x64-Debug/.cmake/api/v1/reply/codemodel-v2-63a6ab1789a1732f4563.json
-out/build/x86-Debug/.cmake/api/v1/reply/target-enet-Debug-d301abed48f6c38bdcfb.json
-out/build/x86-Debug/.cmake/api/v1/reply/index-2020-01-28T12-30-44-0946.json
-out/build/x86-Debug/.cmake/api/v1/reply/codemodel-v2-3eaabe43603befc605b1.json
-out/build/x86-Debug/.cmake/api/v1/reply/target-cmake-main-Debug-70eff68e1e381b42992e.json
-*.xml
-out/build/x86-Debug/.cmake/api/v1/reply/target-enet-Debug-48db38ae5d08e27876b8.json
-out/build/x86-Debug/.cmake/api/v1/reply/target-cmake-main-Debug-540e487569703b71c785.json
-out/build/x86-Debug/.cmake/api/v1/reply/index-2020-01-28T17-35-38-0764.json
-out/build/x86-Debug/.cmake/api/v1/reply/codemodel-v2-6a61e390ef8eaf17e9f8.json
-out/build/x86-Debug/Server.cfg
-*Server.cfg*
-*.cmake
-*.make
-*.xml
-*.includecache
-cmake-build-release/include/commandline/Makefile
-*.lib
-*.cbp
-*.marks
-*.internal
-*.xml
-cmake-build-debug/include/commandline/Makefile
-*.manifest
-*.rc
-*.res
-BeamMP-Server
-*.patch
-callgrind.*
-notes/*
-compile_commands.json
-nohup.out
+/target
+/.idea
+ServerConfig.toml
+beammp_rust_server.iml
@@ -1,27 +0,0 @@
-[submodule "deps/commandline"]
-	path = deps/commandline
-	url = https://github.com/lionkor/commandline
-[submodule "deps/asio"]
-	path = deps/asio
-	url = https://github.com/chriskohlhoff/asio
-[submodule "deps/rapidjson"]
-	path = deps/rapidjson
-	url = https://github.com/Tencent/rapidjson
-[submodule "deps/toml11"]
-	path = deps/toml11
-	url = https://github.com/ToruNiina/toml11
-[submodule "deps/sentry-native"]
-	path = deps/sentry-native
-	url = https://github.com/getsentry/sentry-native
-[submodule "deps/sol2"]
-	path = deps/sol2
-	url = https://github.com/ThePhD/sol2
-[submodule "deps/libzip"]
-	path = deps/libzip
-	url = https://github.com/nih-at/libzip
-[submodule "deps/cpp-httplib"]
-	path = deps/cpp-httplib
-	url = https://github.com/yhirose/cpp-httplib
-[submodule "deps/json"]
-	path = deps/json
-	url = https://github.com/nlohmann/json
@@ -0,0 +1,82 @@
+# BeamMP Protocol Documentation
+WIP of course, but hope it helps others
+
+## TCP
+### Basic message format
+All messages are sent as strings (?).
+Every packet starts with a 4 byte header, denoting how many bytes the packet data is.
+This means that you first must read 4 bytes from your socket, to get the header data, and afterwards read the data ready for reading.
+
+### Communication flow
+Upon client connection:
+1. Authentication
+2. Sync with client?
+
+#### Authentication
+1. C->S - Client sends the server a single byte. The BeamMP source checks for 3 letters, but I only saw C
+2. C->S - Client sends a packet containing the client version
+3. S->C - Server sends the server a regular packet containing only 1 byte: `S` (the ascii character)
+4. C->S - Client sends the server its public key
+5. S->C - Server sends the client their assigned server ID
+
+#### Syncing resources
+1. C->S - Client sends the server a packet with the code `SR`
+2. S->C - Server sends the client a packet containing a filelist containing the name and size of files to download, or "-" if it's empty
+
+### Packets
+All packets start with a single character, denoted as "Packet Code" or simply "Code" down below.
+The data mentioned is merely example data, to show the data format. This includes the code!
+Example:
+| Code | Dir | Explanation | Data |
+| ---- | --- | ----------- | ---- |
+| `C` | C->S | Client version | VC2.0 |
+
+#### Uncategorized
+| Code | Dir | Explanation | Data |
+| ---- | --- | ----------- | ---- |
+| `J` | S->C | Show a message in the top left on the clients screen | JWelcome Luuk! |
+
+#### Authentication
+| Code | Dir | Explanation | Data |
+| ---- | --- | ----------- | ---- |
+| `C` | C->S | Client version | VC2.0 |
+| `S` | S->C | Confirmation? | None |
+| `D` | C->S | Start download phase? Seems unused from testing | None |
+| `P` | S->C | Send client their assigned ID | P123 |
+
+#### Syncing resources
+| Code | Dir | Explanation | Data |
+| ---- | --- | ----------- | ---- |
+| `SR` | C->S | Client requests a list containing all mods, containing their name and file size | None |
+| `f` | C->S | Client requests file with name | fcool_mod.zip |
+| `-` | S->C | Technically not a packet, see [Syncing Resources](https://github.com/Lucky4Luuk/beammp_rust_server/blob/master/BEAMMP_PROTOCOL_DOCS.md#syncing-resources), step 2. | * |
+
+#### Syncing client state
+| Code | Dir | Explanation | Data |
+| ---- | --- | ----------- | ---- |
+| `H` | C->S | Client requests a full sync with the server state | None |
+
+### Vehicle packets
+| Code | Dir | Explanation | Data |
+| ---- | --- | ----------- | ---- |
+| `Os` | C->S | Client informs server they are spawning a car | Os:C_ID:{car_json} |
+| `Os` | S->C | Server sends this packet to all clients, informing them a client has spawned a car | Os:C_ROLES:C_NAME:C_ID-CAR_ID:CAR_JSON |
+| `Or` | C->S | Client informs server they are respawning their car | Or:C_ID-CAR_ID:{respawn_json} |
+| `Or` | S->C | Server informs all other clients that a client is respawning their car | Or:C_ID-CAR_ID:{respawn_json} |
+| `Od` | C->S | Client informs server they are deleting their car | Od:C_ID-CAR_ID |
+| `Od` | S->C | Server informs all other clients that a client is deleting their car | Od:C_ID-CAR_ID |
+| `Oc` | C->S | Client informs server they are editing their car | Oc:?... |
+| `Oc` | S->C | Server informs all other clients that a client has edited their car | Oc:?... |
+
+## UDP
+### Packets
+#### Uncategorized
+| Code | Dir | Explanation | Data |
+| ---- | --- | ----------- | ---- |
+| `p` | C->S | Ping! | None |
+| `p` | S->C | Pong! | None |
+
+#### Vehicle related
+| Code | Dir | Explanation | Data |
+| ---- | --- | ----------- | ---- |
+| `Zp` | C->S | Positional packet | Zp:C_ID-CAR_ID:{transform_json} |
@@ -1,169 +0,0 @@
-cmake_minimum_required(VERSION 3.0)
-
-message(STATUS "You can find build instructions and a list of dependencies in the README at \
-https://github.com/BeamMP/BeamMP-Server")
-
-project(BeamMP-Server
-    DESCRIPTION "Server for BeamMP - The Multiplayer Mod for BeamNG.drive"
-    HOMEPAGE_URL https://beammp.com
-    LANGUAGES CXX C)
-
-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()
-
-if (WIN32)
-    # this has to happen before sentry, so that crashpad on windows links with these settings.
-    message(STATUS "MSVC -> forcing use of statically-linked runtime.")
-    STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
-    STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
-endif()
-
-include_directories("include/sentry-native/include")
-set(BUILD_SHARED_LIBS OFF)
-if (MSVC)
-    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 (MSVC)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
-endif ()
-
-message(STATUS "Adding local source dependencies")
-# this has to happen before -DDEBUG since it wont compile properly with -DDEBUG
-add_subdirectory(deps)
-
-message(STATUS "Setting compiler flags")
-if (WIN32)
-
-    #-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static
-    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 ()
-
-
-
-set(CMAKE_CXX_STANDARD 17)
-
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
-
-add_executable(BeamMP-Server
-        src/main.cpp
-        include/TConsole.h src/TConsole.cpp
-        include/TServer.h src/TServer.cpp
-        include/Compat.h src/Compat.cpp
-        include/Common.h src/Common.cpp
-        include/Client.h src/Client.cpp
-        include/VehicleData.h src/VehicleData.cpp
-        include/TConfig.h src/TConfig.cpp
-        include/TLuaEngine.h src/TLuaEngine.cpp
-        include/TLuaPlugin.h src/TLuaPlugin.cpp
-        include/TResourceManager.h src/TResourceManager.cpp
-        include/THeartbeatThread.h src/THeartbeatThread.cpp
-        include/Http.h src/Http.cpp
-        include/TSentry.h src/TSentry.cpp
-        include/TPPSMonitor.h src/TPPSMonitor.cpp
-        include/TNetwork.h src/TNetwork.cpp
-        include/LuaAPI.h src/LuaAPI.cpp
-        include/TScopedTimer.h src/TScopedTimer.cpp
-        include/SignalHandling.h src/SignalHandling.cpp
-        include/ArgsParser.h src/ArgsParser.cpp
-        include/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 ()
@@ -0,0 +1,36 @@
+[package]
+name = "beammp_rust_server"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+log = "0.4"
+pretty_env_logger = "0.4.0"
+
+argh = "0.1.12"
+
+lazy_static = "1"
+
+anyhow = "1.0.66"
+glam = "0.24.2"
+num_enum = "0.5.7"
+
+async-trait = "0.1.58"
+tokio = { version = "1", features = ["macros", "rt", "rt-multi-thread", "net", "io-util", "sync"] }
+futures = "0.3.29"
+
+reqwest = { version = "0.11", default-features = false, features = ["json", "rustls-tls"] }
+serde = { version = "1.0", features = ["derive"] }
+serde-aux = "4.2.0"
+serde_json = "*"
+
+toml = "0.5"
+flate2 = "1.0"
+
+mlua = { version = "0.9.1", features = ["lua54", "vendored", "send"] }
+
+ratatui = "0.24.0"
+crossterm = "0.27.0"
+uuid = "1.6.1"
@@ -1,123 +0,0 @@
-# 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
@@ -0,0 +1,37 @@
+# This is the BeamMP-Server config file.
+# Help & Documentation: `https://wiki.beammp.com/en/home/server-maintenance`
+# IMPORTANT: Fill in the AuthKey with the key you got from `https://beammp.com/k/dashboard` on the left under "Keys"
+
+[General]
+Name = "bepis big gaming"
+Port = 30814
+# AuthKey has to be filled out in order to run the server
+AuthKey = "test"
+# Whether to log chat messages in the console / log
+LogChat = true
+Debug = false
+Private = true
+MaxCars = 20
+MaxPlayers = 800000
+Map = "/levels/west_coast_usa/info.json"
+Description = "BeamMP Default Description"
+ResourceFolder = "Resources"
+
+[Misc]
+# 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.
+ImScaredOfUpdates = false
+# 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`
+SendErrorsShowMessage = true
+# You can turn on/off the SendErrors message you get on startup here
+SendErrors = true
+
+[HTTP]
+# 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.
+HTTPServerIP = "127.0.0.1"
+SSLKeyPath = "./.ssl/HttpServer/key.pem"
+SSLCertPath = "./.ssl/HttpServer/cert.pem"
+HTTPServerPort = 8080
+# Recommended to have enabled for servers which face the internet. With SSL the server will serve https and requires valid key and cert files
+UseSSL = false
+# Enables the internal HTTP server
+HTTPServerEnabled = false
@@ -1,2 +0,0 @@
-Copyright (c) 2019-present Anonymous275 (@Anonymous-275), Lion Kortlepel (@lionkor). BeamMP-Server code is not in the public domain and is not free software. One must be granted explicit permission by the copyright holder(s) in order to modify or distribute any part of the source or binaries. Special permission to modify the source-code is implicitly granted only for the purpose of upstreaming those changes directly to github.com/BeamMP/BeamMP-Server via a GitHub pull-request.
-Commercial usage is prohibited, unless explicit permission has been granted prior to usage.
@@ -0,0 +1,661 @@
+GNU AFFERO GENERAL PUBLIC LICENSE
+   Version 3, 19 November 2007
+
+Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+        Preamble
+
+The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+   TERMS AND CONDITIONS
+
+0. Definitions.
+
+"This License" refers to version 3 of the GNU Affero General Public License.
+
+"Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+"The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+1. Source Code.
+
+The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+The Corresponding Source for a work in source code form is that
+same work.
+
+2. Basic Permissions.
+
+All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+4. Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+5. Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+a) The work must carry prominent notices stating that you modified
+it, and giving a relevant date.
+
+b) The work must carry prominent notices stating that it is
+released under this License and any conditions added under section
+7.  This requirement modifies the requirement in section 4 to
+"keep intact all notices".
+
+c) You must license the entire work, as a whole, under this
+License to anyone who comes into possession of a copy.  This
+License will therefore apply, along with any applicable section 7
+additional terms, to the whole of the work, and all its parts,
+regardless of how they are packaged.  This License gives no
+permission to license the work in any other way, but it does not
+invalidate such permission if you have separately received it.
+
+d) If the work has interactive user interfaces, each must display
+Appropriate Legal Notices; however, if the Program has interactive
+interfaces that do not display Appropriate Legal Notices, your
+work need not make them do so.
+
+A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+6. Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+a) Convey the object code in, or embodied in, a physical product
+(including a physical distribution medium), accompanied by the
+Corresponding Source fixed on a durable physical medium
+customarily used for software interchange.
+
+b) Convey the object code in, or embodied in, a physical product
+(including a physical distribution medium), accompanied by a
+written offer, valid for at least three years and valid for as
+long as you offer spare parts or customer support for that product
+model, to give anyone who possesses the object code either (1) a
+copy of the Corresponding Source for all the software in the
+product that is covered by this License, on a durable physical
+medium customarily used for software interchange, for a price no
+more than your reasonable cost of physically performing this
+conveying of source, or (2) access to copy the
+Corresponding Source from a network server at no charge.
+
+c) Convey individual copies of the object code with a copy of the
+written offer to provide the Corresponding Source.  This
+alternative is allowed only occasionally and noncommercially, and
+only if you received the object code with such an offer, in accord
+with subsection 6b.
+
+d) Convey the object code by offering access from a designated
+place (gratis or for a charge), and offer equivalent access to the
+Corresponding Source in the same way through the same place at no
+further charge.  You need not require recipients to copy the
+Corresponding Source along with the object code.  If the place to
+copy the object code is a network server, the Corresponding Source
+may be on a different server (operated by you or a third party)
+that supports equivalent copying facilities, provided you maintain
+clear directions next to the object code saying where to find the
+Corresponding Source.  Regardless of what server hosts the
+Corresponding Source, you remain obligated to ensure that it is
+available for as long as needed to satisfy these requirements.
+
+e) Convey the object code using peer-to-peer transmission, provided
+you inform other peers where the object code and Corresponding
+Source of the work are being offered to the general public at no
+charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+"Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+7. Additional Terms.
+
+"Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+a) Disclaiming warranty or limiting liability differently from the
+terms of sections 15 and 16 of this License; or
+
+b) Requiring preservation of specified reasonable legal notices or
+author attributions in that material or in the Appropriate Legal
+Notices displayed by works containing it; or
+
+c) Prohibiting misrepresentation of the origin of that material, or
+requiring that modified versions of such material be marked in
+reasonable ways as different from the original version; or
+
+d) Limiting the use for publicity purposes of names of licensors or
+authors of the material; or
+
+e) Declining to grant rights under trademark law for use of some
+trade names, trademarks, or service marks; or
+
+f) Requiring indemnification of licensors and authors of that
+material by anyone who conveys the material (or modified versions of
+it) with contractual assumptions of liability to the recipient, for
+any liability that these contractual assumptions directly impose on
+those licensors and authors.
+
+All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+8. Termination.
+
+You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+9. Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+10. Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+11. Patents.
+
+A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+12. No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+13. Remote Network Interaction; Use with the GNU General Public License.
+
+Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+14. Revised Versions of this License.
+
+The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+15. Disclaimer of Warranty.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+16. Limitation of Liability.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+17. Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+BeamMP Server implemented in Rust
+Copyright (C) 2023 - Luuk van Oijen
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
@@ -1,123 +1,5 @@
-# BeamMP-Server
+# BeamMP Server
+A BeamMP server implementation in Rust, meant to (hopefully) replace the official server implementation one day.

-[![CMake Windows Build](https://github.com/BeamMP/BeamMP-Server/workflows/CMake%20Windows%20Build/badge.svg?branch=master)](https://github.com/BeamMP/BeamMP-Server/actions?query=workflow%3A%22CMake+Windows+Build%22)
-[![CMake Linux Build](https://github.com/BeamMP/BeamMP-Server/workflows/CMake%20Linux%20Build/badge.svg?branch=master)](https://github.com/BeamMP/BeamMP-Server/actions?query=workflow%3A%22CMake+Linux+Build%22)
-
-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 throug which all clients communicate. You can write lua mods for the server, detailed instructions on the [BeamMP Wiki](https://wiki.beammp.com).
-
-**For Linux, you __need__ the runtime dependencies, listed below under "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)
-
-## Minimum Requirements
-
-These values are guesstimated and are subject to change with each release.
-
-* RAM: 50+ MiB usable (not counting OS overhead)
-* CPU: >1GHz, preferably multicore
-* OS: Windows, Linux (theoretically any POSIX)
-* GPU: None
-* HDD: 10 MiB + Mods/Plugins
-* Bandwidth: 5-10 Mb/s upload
-
-## Contributing
-
-TLDR; [Issues](https://github.com/BeamMP/BeamMP-Server/issues) with the "help wanted" label or with nobody assigned, any [trello](https://trello.com/b/Kw75j3zZ/beamngdrive-multiplayer) cards in the "To-Do" column.
-
-To contribute, look at the active [issues](https://github.com/BeamMP/BeamMP-Server/issues) and at the [trello](https://trello.com/b/Kw75j3zZ/beamngdrive-multiplayer). Any issues that have the "help wanted" label or don't have anyone assigned and any trello cards that aren't assigned or in the "In-Progress" section are good tasks to take on. You can either contribute by programming or by testing and adding more info and ideas.
-
-Fork this repository, make a new branch for your feature, implement your feature or fix, and then create a pull-request here. Even incomplete features and fixes can be pull-requested.
-
-If you need support with understanding the codebase, please write us in the discord. You'll need to be proficient in modern C++.
-
-## About Building from Source
-
-We only allow building unmodified (original) source code for public use. `master` is considered **unstable** and we will not provide technical support if such a build doesn't work, so always build from a tag. You can checkout a tag with `git checkout tags/TAGNAME`, where `TAGNAME` is the tag, for example `v1.20`. 
-
-## Supported Operating Systems
-
-The code itself supports (latest stable) Linux and Windows. In terms of actual build support, for now we usually only distribute windows binaries and sometimes linux. For any other distro or OS, you just have to find the same libraries listed in the Linux Build [Prerequisites](#prerequisites) further down the page, and it should build fine. We don't currently support any big-endian architectures.
-
-Recommended compilers: MSVC, GCC, CLANG. 
-
-You can find precompiled binaries under [Releases](https://github.com/BeamMP/BeamMP-Server/releases/).
-
-## Build Instructions
-
-**__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:
-```
-lua
-zlib
-rapidjson
-openssl
-websocketpp
-curl
-```
-
-#### Linux
-
-These package names are in the debian / ubuntu style. Feel free to PR your own guide for a different distro.
-
-Runtime dependencies for **linux** are (debian/ubuntu):
-```
-libz-dev
-rapidjson-dev
-liblua5.3
-libssl-dev
-libwebsocketpp-dev
-libcurl4-openssl-dev
-```
-
-Build-time dependencies for **linux** are:
-```
-git
-make
-cmake
-g++
-```
-
-For other distributions (e.g. Arch) you want to find packages for:
- libz
- rapidjson
- lua5.3
- ssl / openssl
- websocketpp
- curl (with ssl support)
- \+ the build time dependencies from above
-
-### How to build
-
-On windows, use git-bash for these commands. On Linux, these should work in your shell.
-
-1. Make sure you have all [prerequisites](#prerequisites) installed
-2. Clone the repository in a location of your choice with `git clone --recurse-submodules https://github.com/BeamMP/BeamMP-Server`. 
-3. Ensure that all submodules are initialized by running `git submodule update --init --recursive`. Then change into the cloned directory by running `cd BeamMP-Server`.
-4. Checkout the branch of the release you want to compile (`master` is often unstable), for example `git checkout tags/v3.0.1` for version 3.0.1. You can find the latest version [here](https://github.com/BeamMP/BeamMP-Server/tags).
-5. Run `cmake . -DCMAKE_BUILD_TYPE=Release` (with `.`)
-6. Run `make`
-7. 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_Mod) for further setup after installation (which we just did), such as port-forwarding and getting a key to actually run the server.
-
-*tip: to run the server in the background, simply (in bash, zsh, etc) run:* `nohup ./BeamMP-Server &`*.*
-
-## Copyright
-
-Copyright (c) 2019-present Anonymous275 (@Anonymous-275), Lion Kortlepel (@lionkor).
-BeamMP-Server code is not in the public domain and is not free software. One must be granted explicit permission by the copyright holder(s) in order to modify or distribute any part of the source or binaries. Special permission to modify the source-code is implicitly granted only for the purpose of upstreaming those changes directly to github.com/BeamMP/BeamMP-Server via a GitHub pull-request.
-Commercial usage is prohibited, unless explicit permission has been granted prior to usage.
+## Features
+TODO
@@ -0,0 +1,61 @@
+print("test from lua")
+print("Player count: " .. MP.GetPlayerCount())
+
+function onPluginLoaded()
+    print("HI!")
+end
+
+function onShutdown()
+    print("BYE!")
+end
+
+function onPlayerAuthenticated(joined_name, role, is_guest, identifiers)
+    print("hi welcome mista " .. joined_name)
+    print("u a guest? " .. tostring(is_guest))
+
+    print("current players:")
+    for id, name in pairs(MP.GetPlayers()) do
+        print("- [" .. id .. "]" .. name)
+    end
+    print("yipee")
+
+    print("Player count: " .. MP.GetPlayerCount())
+
+    for key, value in pairs(identifiers) do
+        print(key .. ": " .. value)
+    end
+
+    -- print("now trying with getting it ourself")
+    -- for key, value in pairs(MP.GetPlayerIdentifiers(pid)) do
+    --     print(key .. ": " .. value)
+    -- end
+
+    return 0 -- 0 = do not cancel
+end
+
+function onPlayerDisconnect(pid, name, identifiers)
+    -- Player is already gone here, so for now, player data is no longer
+    -- requestable for player with the id `pid`
+    print("Player " .. name .. " (" .. pid .. ") has left!")
+end
+
+function onChatMessage(pid, name, message)
+    MP.SendChatMessage(-1, "i hate this " .. name .. " guy!")
+    MP.SendChatMessage(pid, "hiii babe i didnt mean it :3")
+    print("" .. name .. " (" .. pid .. "): " .. message)
+
+    print("identifiers:")
+    for key, value in pairs(MP.GetPlayerIdentifiers(pid)) do
+        print(key .. ": " .. value)
+    end
+
+    print("unknown identifiers (nil): " .. tostring(MP.GetPlayerIdentifiers(100)))
+
+    return message .. " (edited by lua!!!)"
+end
+
+MP.RegisterEventHandler("onInit", "onPluginLoaded")
+MP.RegisterEventHandler("onShutdown", "onShutdown")
+MP.RegisterEventHandler("onPlayerAuth", "onPlayerAuthenticated")
+MP.RegisterEventHandler("onPlayerDisconnect", "onPlayerDisconnect")
+MP.RegisterEventHandler("onChatMessage", "onChatMessage")
@@ -1,9 +0,0 @@
-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")
@@ -1,49 +0,0 @@
-#pragma once
-
-#include <initializer_list>
-#include <optional>
-#include <string>
-#include <string_view>
-#include <vector>
-
-/*
- * Allows syntax:
- *  --help              : long flags
- *  --path=/home/lion   : long assignments
- */
-class ArgsParser {
-public:
-    enum Flags : int {
-        NONE = 0,
-        REQUIRED = 1, // argument is required
-        HAS_VALUE = 2, // argument must have a value
-    };
-
-    ArgsParser() = default;
-
-    void Parse(const std::vector<std::string_view>& ArgList);
-    // prints errors if any errors occurred, in that case also returns false
-    bool Verify();
-    void RegisterArgument(std::vector<std::string>&& ArgumentNames, int Flags);
-    // pass all possible names for this argument (short, long, etc)
-    bool FoundArgument(const std::vector<std::string>& Names);
-    std::optional<std::string> GetValueOfArgument(const std::vector<std::string>& Names);
-
-private:
-    void ConsumeLongAssignment(const std::string& Arg);
-    void ConsumeLongFlag(const std::string& Arg);
-    bool IsRegistered(const std::string& Name);
-
-    struct Argument {
-        std::string Name;
-        std::optional<std::string> Value;
-    };
-
-    struct RegisteredArgument {
-        std::vector<std::string> Names;
-        int Flags;
-    };
-
-    std::vector<RegisteredArgument> mRegisteredArguments;
-    std::vector<Argument> mFoundArgs;
-};
@@ -1,108 +0,0 @@
-#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);
@@ -1,269 +0,0 @@
-#pragma once
-
-#include "TSentry.h"
-extern TSentry Sentry;
-
-#include <array>
-#include <atomic>
-#include <cstring>
-#include <deque>
-#include <filesystem>
-#include <functional>
-#include <memory>
-#include <mutex>
-#include <sstream>
-#include <zlib.h>
-
-#include "Compat.h"
-
-#include "TConsole.h"
-
-struct Version {
-    uint8_t major;
-    uint8_t minor;
-    uint8_t patch;
-    Version(uint8_t major, uint8_t minor, uint8_t patch);
-    Version(const std::array<uint8_t, 3>& v);
-    std::string AsString();
-};
-
-// 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
-// stuff like graceful shutdown, global settings (its in the name),
-// etc.
-class Application final {
-public:
-    // types
-    struct TSettings {
-        std::string ServerName { "BeamMP Server" };
-        std::string ServerDesc { "BeamMP Default Description" };
-        std::string Resource { "Resources" };
-        std::string MapName { "/levels/gridmap_v2/info.json" };
-        std::string Key {};
-        std::string SSLKeyPath { "./.ssl/HttpServer/key.pem" };
-        std::string SSLCertPath { "./.ssl/HttpServer/cert.pem" };
-        bool HTTPServerEnabled { false };
-        int MaxPlayers { 8 };
-        bool Private { true };
-        int MaxCars { 1 };
-        bool DebugModeEnabled { false };
-        int Port { 30814 };
-        std::string CustomIP {};
-        bool SendErrors { true };
-        bool SendErrorsMessageEnabled { true };
-        int HTTPServerPort { 8080 };
-        std::string HTTPServerIP { "127.0.0.1" };
-        bool HTTPServerUseSSL { false };
-        bool HideUpdateMessages { false };
-        [[nodiscard]] bool HasCustomIP() const { return !CustomIP.empty(); }
-    };
-
-    using TShutdownHandler = std::function<void()>;
-
-    // methods
-    Application() = delete;
-
-    // 'Handler' is called when GracefullyShutdown is called
-    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 std::string ServerVersionString();
-    static const Version& ServerVersion() { return mVersion; }
-    static std::string ClientVersionString() { return "2.0"; }
-    static std::string PPS() { return mPPS; }
-    static void SetPPS(const std::string& NewPPS) { mPPS = NewPPS; }
-
-    static TSettings Settings;
-
-    static std::vector<std::string> GetBackendUrlsInOrder() {
-        return {
-            "backend.beammp.com",
-            "backup1.beammp.com",
-            "backup2.beammp.com"
-        };
-    }
-
-    static std::string GetBackendUrlForAuth() { return "auth.beammp.com"; }
-    static std::string GetBackendUrlForSocketIO() { return "https://backend.beammp.com"; }
-    static void CheckForUpdates();
-    static std::array<uint8_t, 3> VersionStrToInts(const std::string& str);
-    static bool IsOutdated(const Version& Current, const Version& Newest);
-
-    static void InitializeConsole() {
-        if (!mConsole) {
-            mConsole = std::make_unique<TConsole>();
-        }
-    }
-
-    enum class Status {
-        Starting,
-        Good,
-        Bad,
-        ShuttingDown,
-        Shutdown,
-    };
-
-    using SystemStatusMap = std::unordered_map<std::string /* system name */, Status /* status */>;
-
-    static const SystemStatusMap& GetSubsystemStatuses() {
-        std::unique_lock Lock(mSystemStatusMapMutex);
-        return mSystemStatusMap;
-    }
-
-    static void SetSubsystemStatus(const std::string& Subsystem, Status status);
-
-private:
-    static inline SystemStatusMap mSystemStatusMap {};
-    static inline std::mutex mSystemStatusMapMutex {};
-    static inline std::string mPPS;
-    static inline std::unique_ptr<TConsole> mConsole;
-    static inline std::mutex mShutdownHandlersMutex {};
-    static inline std::deque<TShutdownHandler> mShutdownHandlers {};
-
-    static inline Version mVersion { 3, 0, 2 };
-};
-
-std::string ThreadName(bool DebugModeOverride = false);
-void RegisterThread(const std::string& str);
-#define RegisterThreadAuto() RegisterThread(__func__)
-
-#define KB 1024
-#define MB (KB * 1024)
-#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()
-#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)
-
-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);
@@ -1,53 +0,0 @@
-#pragma once
-
-#include "Environment.h"
-
-// ======================= UNIX ========================
-
-#ifdef BEAMMP_LINUX
-#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 <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
@@ -1,114 +0,0 @@
-// Copyright Anonymous275 8/11/2020
-
-#pragma once
-#include <array>
-#include <cstdarg>
-#include <string>
-
-namespace Crypto {
-
-constexpr auto time = __TIME__;
-constexpr auto seed = static_cast<int>(time[7]) + static_cast<int>(time[6]) * 10 + static_cast<int>(time[4]) * 60 + static_cast<int>(time[3]) * 600 + static_cast<int>(time[1]) * 3600 + static_cast<int>(time[0]) * 36000;
-
-// 1988, Stephen Park and Keith Miller
-// "Random Number Generators: Good Ones Are Hard To Find", considered as "minimal standard"
-// Park-Miller 31 bit pseudo-random number generator, implemented with G. Carta's optimisation:
-// with 32-bit math and without division
-
-template <int N>
-struct RandomGenerator {
-private:
-    static constexpr unsigned a = 16807; // 7^5
-    static constexpr unsigned m = 2147483647; // 2^31 - 1
-
-    static constexpr unsigned s = RandomGenerator<N - 1>::value;
-    static constexpr unsigned lo = a * (s & 0xFFFFu); // Multiply lower 16 bits by 16807
-    static constexpr unsigned hi = a * (s >> 16u); // Multiply higher 16 bits by 16807
-    static constexpr unsigned lo2 = lo + ((hi & 0x7FFFu) << 16u); // Combine lower 15 bits of hi with lo's upper bits
-    static constexpr unsigned hi2 = hi >> 15u; // Discard lower 15 bits of hi
-    static constexpr unsigned lo3 = lo2 + hi;
-
-public:
-    static constexpr unsigned max = m;
-    static constexpr unsigned value = lo3 > m ? lo3 - m : lo3;
-};
-
-template <>
-struct RandomGenerator<0> {
-    static constexpr unsigned value = seed;
-};
-
-template <int N, int M>
-struct RandomInt {
-    static constexpr auto value = RandomGenerator<N + 1>::value % M;
-};
-
-template <int N>
-struct RandomChar {
-    static const char value = static_cast<char>(1 + RandomInt<N, 0x7F - 1>::value);
-};
-
-template <size_t N, int K, typename Char>
-struct MangleString {
-private:
-    const char _key;
-    std::array<Char, N + 1> _encrypted;
-
-    constexpr Char enc(Char c) const {
-        return c ^ _key;
-    }
-
-    Char dec(Char c) const {
-        return c ^ _key;
-    }
-
-public:
-    template <size_t... Is>
-    constexpr MangleString(const Char* str, std::index_sequence<Is...>)
-        : _key(RandomChar<K>::value)
-        , _encrypted { enc(str[Is])... } { }
-
-    decltype(auto) decrypt() {
-        for (size_t i = 0; i < N; ++i) {
-            _encrypted[i] = dec(_encrypted[i]);
-        }
-        _encrypted[N] = '\0';
-        return _encrypted.data();
-    }
-};
-
-static auto w_printf = [](const char* fmt, ...) {
-    va_list args;
-    va_start(args, fmt);
-    vprintf(fmt, args);
-    va_end(args);
-};
-
-static auto w_printf_s = [](const char* fmt, ...) {
-    va_list args;
-    va_start(args, fmt);
-    vprintf(fmt, args);
-    va_end(args);
-};
-
-static auto w_sprintf_s = [](char* buf, size_t, const char* fmt, ...) {
-    va_list args;
-    va_start(args, fmt);
-    vsprintf(buf, fmt, args);
-    va_end(args);
-};
-
-static auto w_sprintf_s_ret = [](char* buf, size_t, const char* fmt, ...) {
-    int ret;
-    va_list args;
-    va_start(args, fmt);
-    ret = vsprintf(buf, fmt, args);
-    va_end(args);
-    return ret;
-};
-
-#define XOR_C(s) [] { constexpr Crypto::MangleString< sizeof(s)/sizeof(char) - 1, __COUNTER__, char > expr( s, std::make_index_sequence< sizeof(s)/sizeof(char) - 1>() ); return expr; }().decrypt()
-#define XOR_W(s) [] { constexpr Crypto::MangleString< sizeof(s)/sizeof(wchar_t) - 1, __COUNTER__, wchar_t > expr( s, std::make_index_sequence< sizeof(s)/sizeof(wchar_t) - 1>() ); return expr; }().decrypt()
-#define RAWIFY(s) XOR_C(s)
-
-}
@@ -1,73 +0,0 @@
-// Author: lionkor
-
-/*
- * Asserts are to be used anywhere where assumptions about state are made
- * implicitly. AssertNotReachable is used where code should never go, like in
- * default switch cases which shouldn't trigger. They make it explicit
- * that a place cannot normally be reached and make it an error if they do.
- */
-
-#pragma once
-
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <sstream>
-#include <thread>
-
-#include "Common.h"
-
-static const char* const ANSI_RESET = "\u001b[0m";
-
-static const char* const ANSI_BLACK = "\u001b[30m";
-static const char* const ANSI_RED = "\u001b[31m";
-static const char* const ANSI_GREEN = "\u001b[32m";
-static const char* const ANSI_YELLOW = "\u001b[33m";
-static const char* const ANSI_BLUE = "\u001b[34m";
-static const char* const ANSI_MAGENTA = "\u001b[35m";
-static const char* const ANSI_CYAN = "\u001b[36m";
-static const char* const ANSI_WHITE = "\u001b[37m";
-
-static const char* const ANSI_BLACK_BOLD = "\u001b[30;1m";
-static const char* const ANSI_RED_BOLD = "\u001b[31;1m";
-static const char* const ANSI_GREEN_BOLD = "\u001b[32;1m";
-static const char* const ANSI_YELLOW_BOLD = "\u001b[33;1m";
-static const char* const ANSI_BLUE_BOLD = "\u001b[34;1m";
-static const char* const ANSI_MAGENTA_BOLD = "\u001b[35;1m";
-static const char* const ANSI_CYAN_BOLD = "\u001b[36;1m";
-static const char* const ANSI_WHITE_BOLD = "\u001b[37;1m";
-
-static const char* const ANSI_BOLD = "\u001b[1m";
-static const char* const ANSI_UNDERLINE = "\u001b[4m";
-
-#ifdef DEBUG
-#include <iostream>
-inline void _assert([[maybe_unused]] const char* file, [[maybe_unused]] const char* function, [[maybe_unused]] unsigned line,
-    [[maybe_unused]] const char* condition_string, [[maybe_unused]] bool result) {
-    if (!result) {
-        std::cout << std::flush << "(debug build) TID "
-                  << std::this_thread::get_id() << ": ASSERTION FAILED: at "
-                  << file << ":" << line << " \n\t-> in "
-                  << function << ", Line " << line << ": \n\t\t-> "
-                  << "Failed Condition: " << condition_string << std::endl;
-        std::cout << "... terminating ..." << std::endl;
-        abort();
-    }
-}
-
-#define beammp_assert(cond) _assert(__FILE__, __func__, __LINE__, #cond, (cond))
-#define beammp_assert_not_reachable() _assert(__FILE__, __func__, __LINE__, "reached unreachable code", false)
-#else
-// In release build, these macros turn into NOPs. The compiler will optimize these out.
-#define beammp_assert(cond)                                           \
-    do {                                                              \
-        bool result = (cond);                                         \
-        if (!result) {                                                \
-            Sentry.LogAssert(#cond, _file_basename, _line, __func__); \
-        }                                                             \
-    } while (false)
-#define beammp_assert_not_reachable()                                             \
-    do {                                                                          \
-        Sentry.LogAssert("code is unreachable", _file_basename, _line, __func__); \
-    } while (false)
-#endif // DEBUG
@@ -1,18 +0,0 @@
-#pragma once
-
-#include <functional>
-
-template <typename FnT>
-class Defer final {
-public:
-    Defer(FnT fn)
-        : mFunction([&fn] { (void)fn(); }) { }
-    ~Defer() {
-        if (mFunction) {
-            mFunction();
-        }
-    }
-
-private:
-    std::function<void()> mFunction;
-};
@@ -1,17 +0,0 @@
-#pragma once
-
-// one of BEAMMP_{WINDOWS,LINUX,APPLE} will be set at the end of this
-
-// clang-format off
-#if !defined(BEAMMP_WINDOWS) && !defined(BEAMMP_UNIX) && !defined(BEAMMP_APPLE)
-    #if defined(_WIN32) || defined(__CYGWIN__)
-        #define BEAMMP_WINDOWS
-    #elif defined(__linux__) || defined(__linux) || defined(linux) || defined(__unix__) || defined(__unix) || defined(unix)
-        #define BEAMMP_LINUX
-    #elif defined(__APPLE__) || defined(__MACH__)
-        #define BEAMMP_APPLE
-    #else
-        #error "This platform is not known. Please define one of the above for your OS."
-    #endif
-#endif
-// clang-format on
@@ -1,60 +0,0 @@
-#pragma once
-
-#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"
-#endif
-#include <httplib.h>
-#if defined(BEAMMP_LINUX)
-#pragma GCC diagnostic pop
-#endif
-
-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 = {});
-namespace Status {
-    std::string ToString(int code);
-}
-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()();
-
-    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);
-    };
-}
-}
@@ -1,24 +0,0 @@
-#pragma once
-
-#include <thread>
-
-// pure virtual class to be inherited from by classes which intend to be threaded
-class IThreaded {
-public:
-    IThreaded()
-        // invokes operator() on this object
-        : mThread() { }
-    ~IThreaded() noexcept {
-        if (mThread.joinable()) {
-            mThread.join();
-        }
-    }
-
-    virtual void Start() final {
-        mThread = std::thread([this] { (*this)(); });
-    }
-    virtual void operator()() = 0;
-
-protected:
-    std::thread mThread;
-};
@@ -1,9 +0,0 @@
-//
-// Created by anon on 4/21/21.
-//
-
-#pragma once
-#include "rapidjson/stringbuffer.h"
-#include "rapidjson/prettywriter.h"
-#include "rapidjson/document.h"
-#include "rapidjson/writer.h"
@@ -1,39 +0,0 @@
-#pragma once
-
-#include "TLuaEngine.h"
-#include <tuple>
-
-namespace LuaAPI {
-int PanicHandler(lua_State* State);
-std::string LuaToString(const sol::object Value, size_t Indent = 1, bool QuoteStrings = false);
-void Print(sol::variadic_args);
-namespace MP {
-    extern TLuaEngine* Engine;
-
-    std::string GetOSName();
-    std::tuple<int, int, int> GetServerVersion();
-    bool TriggerClientEvent(int PlayerID, const std::string& EventName, const std::string& Data);
-    inline size_t GetPlayerCount() { return Engine->Server().ClientCount(); }
-    void DropPlayer(int ID, std::optional<std::string> MaybeReason);
-    void SendChatMessage(int ID, const std::string& Message);
-    void 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);
-}
-namespace FS {
-    std::pair<bool, std::string> CreateDirectory(const std::string& Path);
-    std::pair<bool, std::string> Remove(const std::string& Path);
-    std::pair<bool, std::string> Rename(const std::string& Path, const std::string& NewPath);
-    std::pair<bool, std::string> Copy(const std::string& Path, const std::string& NewPath);
-    std::string GetFilename(const std::string& Path);
-    std::string GetExtension(const std::string& Path);
-    std::string GetParentFolder(const std::string& Path);
-    bool Exists(const std::string& Path);
-    bool IsDirectory(const std::string& Path);
-    bool IsFile(const std::string& Path);
-    std::string ConcatPaths(sol::variadic_args Args);
-}
-}
@@ -1,20 +0,0 @@
-// Author: lionkor
-#pragma once
-
-/*
- * An RWMutex allows multiple simultaneous readlocks but only one writelock at a time,
- * and write locks and read locks are mutually exclusive.
- */
-
-#include <shared_mutex>
-#include <mutex>
-
-// Use ReadLock(m) and WriteLock(m) to lock it.
-using RWMutex = std::shared_mutex;
-// Construct with an RWMutex as a non-const reference.
-// locks the mutex in lock_shared mode (for reading). Locking in a thread that already owns a lock
-// i.e. locking multiple times successively is UB. Construction may be blocking. Destruction is guaranteed to release the lock.
-using ReadLock = std::shared_lock<RWMutex>;
-// Construct with an RWMutex as a non-const reference.
-// locks the mutex for writing. Construction may be blocking. Destruction is guaranteed to release the lock.
-using WriteLock = std::unique_lock<RWMutex>;
@@ -1,3 +0,0 @@
-#pragma once
-
-void SetupSignalHandlers();
@@ -1,32 +0,0 @@
-#pragma once
-
-#include "Common.h"
-
-#include <atomic>
-
-#define TOML11_PRESERVE_COMMENTS_BY_DEFAULT
-#include <toml11/toml.hpp> // header-only version of TOML++
-
-namespace fs = std::filesystem;
-
-class TConfig {
-public:
-    explicit TConfig(const std::string& ConfigFileName);
-
-    [[nodiscard]] bool Failed() const { return mFailed; }
-
-    void FlushToFile();
-
-private:
-    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, std::string& OutValue);
-    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, bool& OutValue);
-    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, int& OutValue);
-
-    void ParseOldFormat();
-    bool IsDefault();
-    bool mFailed { false };
-    std::string mConfigFileName;
-};
@@ -1,43 +0,0 @@
-#pragma once
-
-#include "Cryptography.h"
-#include "commandline.h"
-#include <atomic>
-#include <fstream>
-
-class TLuaEngine;
-
-class TConsole {
-public:
-    TConsole();
-
-    void Write(const std::string& str);
-    void WriteRaw(const std::string& str);
-    void InitializeLuaConsole(TLuaEngine& Engine);
-    void BackupOldLog();
-    void StartLoggingToFile();
-    Commandline& Internal() { return mCommandline; }
-
-private:
-    void RunAsCommand(const std::string& cmd, bool IgnoreNotACommand = false);
-    void ChangeToLuaConsole(const std::string& LuaStateId);
-    void ChangeToRegularConsole();
-
-    void Command_Lua(const std::string& cmd);
-    void Command_Help(const std::string& cmd);
-    void Command_Kick(const std::string& cmd);
-    void Command_Say(const std::string& cmd);
-    void Command_List(const std::string& cmd);
-    void Command_Status(const std::string& cmd);
-
-    Commandline mCommandline;
-    std::vector<std::string> mCachedLuaHistory;
-    std::vector<std::string> mCachedRegularHistory;
-    TLuaEngine* mLuaEngine { nullptr };
-    bool mIsLuaConsole { false };
-    bool mFirstTime { true };
-    std::string mStateId;
-    const std::string mDefaultStateId = "BEAMMP_SERVER_CONSOLE";
-    std::ofstream mLogFileStream;
-    std::mutex mLogFileStreamMtx;
-};
@@ -1,21 +0,0 @@
-#pragma once
-
-#include "Common.h"
-#include "IThreaded.h"
-#include "TResourceManager.h"
-#include "TServer.h"
-
-class THeartbeatThread : public IThreaded {
-public:
-    THeartbeatThread(TResourceManager& ResourceManager, TServer& Server);
-    //~THeartbeatThread();
-    void operator()() override;
-
-private:
-    std::string GenerateCall();
-    std::string GetPlayers();
-
-    bool mShutdown = false;
-    TResourceManager& mResourceManager;
-    TServer& mServer;
-};
@@ -1,241 +0,0 @@
-#pragma once
-
-#include "TNetwork.h"
-#include "TServer.h"
-#include <any>
-#include <condition_variable>
-#include <filesystem>
-#include <initializer_list>
-#include <list>
-#include <lua.hpp>
-#include <memory>
-#include <mutex>
-#include <queue>
-#include <set>
-#include <toml11/toml.hpp>
-#include <unordered_map>
-#include <vector>
-
-#define SOL_ALL_SAFETIES_ON 1
-#include <sol/sol.hpp>
-
-using TLuaStateId = std::string;
-namespace fs = std::filesystem;
-/**
- * std::variant means, that TLuaArgTypes may be one of the Types listed as template args
- */
-using TLuaArgTypes = std::variant<std::string, int, sol::variadic_args, bool>;
-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;
-
-class TLuaPlugin;
-
-struct TLuaResult {
-    std::atomic_bool Ready;
-    std::atomic_bool Error;
-    std::string ErrorMessage;
-    sol::object Result { sol::lua_nil };
-    TLuaStateId StateId;
-    std::string Function;
-    // TODO: Add condition_variable
-    void WaitUntilReady();
-};
-
-struct TLuaPluginConfig {
-    static inline const std::string FileName = "PluginConfig.toml";
-    TLuaStateId StateId;
-    // TODO: Add execute list
-};
-
-struct TLuaChunk {
-    TLuaChunk(std::shared_ptr<std::string> Content,
-        std::string FileName,
-        std::string PluginPath);
-    std::shared_ptr<std::string> Content;
-    std::string FileName;
-    std::string PluginPath;
-};
-
-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,
-        Precise,
-    };
-
-    struct QueuedFunction {
-        std::string FunctionName;
-        std::shared_ptr<TLuaResult> Result;
-        std::vector<TLuaArgTypes> Args;
-        std::string EventName; // optional, may be empty
-    };
-
-    TLuaEngine();
-    ~TLuaEngine() noexcept {
-        beammp_debug("Lua Engine terminated");
-    }
-
-    void operator()() override;
-
-    TNetwork& Network() { return *mNetwork; }
-    TServer& Server() { return *mServer; }
-
-    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();
-    }
-    size_t GetTimedEventsCount() {
-        std::unique_lock Lock(mTimedEventsMutex);
-        return mTimedEvents.size();
-    }
-    size_t GetRegisteredEventHandlerCount() {
-        std::unique_lock Lock(mLuaEventsMutex);
-        size_t LuaEventsCount = 0;
-        for (const auto& State : mLuaEvents) {
-            for (const auto& Events : State.second) {
-                LuaEventsCount += Events.second.size();
-            }
-        }
-        return LuaEventsCount - GetLuaStateCount();
-    }
-
-    static void WaitForAll(std::vector<std::shared_ptr<TLuaResult>>& Results,
-        const std::optional<std::chrono::high_resolution_clock::duration>& Max = std::nullopt);
-    void ReportErrors(const std::vector<std::shared_ptr<TLuaResult>>& Results);
-    bool HasState(TLuaStateId StateId);
-    [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueScript(TLuaStateId StateID, const TLuaChunk& Script);
-    [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCall(TLuaStateId StateID, const std::string& FunctionName, const std::vector<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
-     * @param EventName Name of the event
-     * @param IgnoreId
-     * @param Args
-     * @return
-     */
-    [[nodiscard]] std::vector<std::shared_ptr<TLuaResult>> TriggerEvent(const std::string& EventName, TLuaStateId IgnoreId, ArgsT&&... Args) {
-        std::unique_lock Lock(mLuaEventsMutex);
-        beammp_event(EventName);
-        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) }... };
-
-        for (const auto& Event : mLuaEvents.at(EventName)) {
-            for (const auto& Function : Event.second) {
-                if (Event.first != IgnoreId) {
-                    Results.push_back(EnqueueFunctionCall(Event.first, Function, 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);
-    sol::state_view GetStateForPlugin(const fs::path& PluginPath);
-    TLuaStateId GetStateIDForPlugin(const fs::path& PluginPath);
-    void AddResultToCheck(const std::shared_ptr<TLuaResult>& Result);
-
-    static constexpr const char* BeamMPFnNotFoundError = "BEAMMP_FN_NOT_FOUND";
-
-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 : IThreaded {
-    public:
-        StateThreadData(const std::string& Name, std::atomic_bool& Shutdown, TLuaStateId StateId, TLuaEngine& Engine);
-        StateThreadData(const StateThreadData&) = delete;
-        ~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 operator()() override;
-        sol::state_view State() { return sol::state_view(mState); }
-
-    private:
-        sol::table Lua_TriggerGlobalEvent(const std::string& EventName, sol::variadic_args EventArgs);
-        sol::table Lua_TriggerLocalEvent(const std::string& EventName, sol::variadic_args EventArgs);
-        sol::table Lua_GetPlayerIdentifiers(int ID);
-        sol::table Lua_GetPlayers();
-        std::string Lua_GetPlayerName(int ID);
-        sol::table Lua_GetPlayerVehicles(int ID);
-        sol::table Lua_HttpCreateConnection(const std::string& host, uint16_t port);
-        int Lua_GetPlayerIDByName(const std::string& Name);
-
-        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;
-        std::mutex mStateFunctionQueueMutex;
-        std::condition_variable mStateFunctionQueueCond;
-        TLuaEngine* mEngine;
-        sol::state_view mStateView { mState };
-        std::queue<fs::path> mPaths;
-        std::recursive_mutex mPathsMutex;
-    };
-
-    struct TimedEvent {
-        std::chrono::high_resolution_clock::duration Duration {};
-        std::chrono::high_resolution_clock::time_point LastCompletion {};
-        std::string EventName;
-        TLuaStateId StateId;
-        CallStrategy Strategy;
-        bool Expired();
-        void Reset();
-    };
-
-    TNetwork* mNetwork;
-    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;
-    std::unordered_map<std::string /* event name */, std::unordered_map<TLuaStateId, std::set<std::string>>> mLuaEvents;
-    std::recursive_mutex mLuaEventsMutex;
-    std::vector<TimedEvent> mTimedEvents;
-    std::recursive_mutex mTimedEventsMutex;
-    std::list<std::shared_ptr<TLuaResult>> mResultsToCheck;
-    std::mutex mResultsToCheckMutex;
-    std::condition_variable mResultsToCheckCond;
-};
-
-// std::any TriggerLuaEvent(const std::string& Event, bool local, TLuaPlugin* Caller, std::shared_ptr<TLuaArg> arg, bool Wait);
@@ -1,19 +0,0 @@
-#include "TLuaEngine.h"
-
-class TLuaPlugin {
-public:
-    TLuaPlugin(TLuaEngine& Engine, const TLuaPluginConfig& Config, const fs::path& MainFolder);
-    TLuaPlugin(const TLuaPlugin&) = delete;
-    TLuaPlugin& operator=(const TLuaPlugin&) = delete;
-    ~TLuaPlugin() noexcept = default;
-
-    const TLuaPluginConfig& GetConfig() const { return mConfig; }
-    fs::path GetFolder() const { return mFolder; }
-
-private:
-    TLuaPluginConfig mConfig;
-    TLuaEngine& mEngine;
-    fs::path mFolder;
-    std::string mPluginName;
-    std::unordered_map<std::string, std::shared_ptr<std::string>> mFileContents;
-};
@@ -1,51 +0,0 @@
-#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);
-};
@@ -1,27 +0,0 @@
-#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 };
-};
@@ -1,21 +0,0 @@
-#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;
-};
@@ -1,25 +0,0 @@
-#pragma once
-
-#include <chrono>
-#include <functional>
-#include <string>
-
-class TScopedTimer {
-public:
-    TScopedTimer();
-    TScopedTimer(const std::string& Name);
-    TScopedTimer(std::function<void(size_t)> OnDestroy);
-    ~TScopedTimer();
-    auto GetElapsedTime() const {
-        auto EndTime = std::chrono::high_resolution_clock::now();
-        auto Delta = EndTime - mStartTime;
-        size_t TimeDelta = Delta / std::chrono::milliseconds(1);
-        return TimeDelta;
-    }
-
-    std::function<void(size_t /* time_ms */)> OnDestroy { nullptr };
-
-private:
-    std::chrono::high_resolution_clock::time_point mStartTime;
-    std::string Name;
-};
@@ -1,38 +0,0 @@
-#ifndef SENTRY_H
-#define SENTRY_H
-
-#include <mutex>
-#include <string>
-#include <unordered_map>
-enum class SentryLevel {
-    Debug = -1,
-    Info = 0,
-    Warning = 1,
-    Error = 2,
-    Fatal = 3,
-};
-
-// singleton, dont make this twice
-class TSentry final {
-public:
-    TSentry();
-    ~TSentry();
-
-    void PrintWelcome();
-    void SetupUser();
-    void Log(SentryLevel level, const std::string& logger, const std::string& text);
-    void LogError(const std::string& text, const std::string& file, const std::string& line);
-    void SetContext(const std::string& context_name, const std::unordered_map<std::string, std::string>& map);
-    void LogException(const std::exception& e, const std::string& file, const std::string& line);
-    void LogAssert(const std::string& condition_string, const std::string& file, const std::string& line, const std::string& function);
-    void AddErrorBreadcrumb(const std::string& msg, const std::string& file, const std::string& line);
-    // cleared when Logged
-    void SetTransaction(const std::string& id);
-    [[nodiscard]] std::unique_lock<std::mutex> CreateExclusiveContext();
-
-private:
-    bool mValid { true };
-    std::mutex mMutex;
-};
-
-#endif // SENTRY_H
@@ -1,41 +0,0 @@
-#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);
-};
@@ -1,35 +0,0 @@
-#pragma once
-
-#include <string>
-
-class TVehicleData final {
-public:
-    TVehicleData(int ID, std::string Data);
-    ~TVehicleData();
-    // We cannot delete this, since vector needs to be able to copy when it resizes.
-    // Deleting this causes some wacky template errors which are hard to decipher,
-    // and end up making no sense, so let's just leave the copy ctor.
-    // TVehicleData(const TVehicleData&) = delete;
-
-    [[nodiscard]] bool IsInvalid() const { return mID == -1; }
-    [[nodiscard]] int ID() const { return mID; }
-
-    [[nodiscard]] std::string Data() const { return mData; }
-    void SetData(const std::string& Data) { mData = Data; }
-
-    bool operator==(const TVehicleData& v) const { return mID == v.mID; }
-
-private:
-    int mID { -1 };
-    std::string mData;
-};
-
-// TODO: unused now, remove?
-namespace std {
-template <>
-struct hash<TVehicleData> {
-    std::size_t operator()(const TVehicleData& s) const noexcept {
-        return s.ID();
-    }
-};
-}
@@ -1,94 +0,0 @@
-#include "ArgsParser.h"
-#include "Common.h"
-#include <algorithm>
-
-void ArgsParser::Parse(const std::vector<std::string_view>& ArgList) {
-    for (const auto& Arg : ArgList) {
-        if (Arg.size() > 2 && Arg.substr(0, 2) == "--") {
-            // long arg
-            if (Arg.find("=") != Arg.npos) {
-                ConsumeLongAssignment(std::string(Arg));
-            } else {
-                ConsumeLongFlag(std::string(Arg));
-            }
-        } else {
-            beammp_error("Error parsing commandline arguments: Supplied argument '" + std::string(Arg) + "' is not a valid argument and was ignored.");
-        }
-    }
-}
-
-bool ArgsParser::Verify() {
-    bool Ok = true;
-    for (const auto& RegisteredArg : mRegisteredArguments) {
-        if (RegisteredArg.Flags & Flags::REQUIRED && !FoundArgument(RegisteredArg.Names)) {
-            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)) {
-            if (RegisteredArg.Flags & Flags::HAS_VALUE) {
-                if (!GetValueOfArgument(RegisteredArg.Names).has_value()) {
-                    beammp_error("Error in commandline arguments: Argument '" + std::string(RegisteredArg.Names.at(0)) + "' expects a value, but no value was given.");
-                    Ok = false;
-                }
-            } else if (GetValueOfArgument(RegisteredArg.Names).has_value()) {
-                beammp_error("Error in commandline arguments: Argument '" + std::string(RegisteredArg.Names.at(0)) + "' does not expect a value, but one was given.");
-                Ok = false;
-            }
-        }
-    }
-    return Ok;
-}
-
-void ArgsParser::RegisterArgument(std::vector<std::string>&& ArgumentNames, int Flags) {
-    mRegisteredArguments.push_back({ ArgumentNames, Flags });
-}
-
-bool ArgsParser::FoundArgument(const std::vector<std::string>& Names) {
-    // if any of the found args match any of the names
-    return std::any_of(mFoundArgs.begin(), mFoundArgs.end(),
-        [&Names](const Argument& Arg) -> bool {
-            // if any of the names match this arg's name
-            return std::any_of(Names.begin(), Names.end(), [&Arg](const std::string& Name) -> bool {
-                return Arg.Name == Name;
-            });
-        });
-}
-
-std::optional<std::string> ArgsParser::GetValueOfArgument(const std::vector<std::string>& Names) {
-    // finds an entry which has a name that is any of the names in 'Names'
-    auto Found = std::find_if(mFoundArgs.begin(), mFoundArgs.end(), [&Names](const Argument& Arg) -> bool {
-        return std::any_of(Names.begin(), Names.end(), [&Arg](const std::string_view& Name) -> bool {
-            return Arg.Name == Name;
-        });
-    });
-    if (Found != mFoundArgs.end()) {
-        // found
-        return Found->Value;
-    } else {
-        return std::nullopt;
-    }
-}
-
-bool ArgsParser::IsRegistered(const std::string& Name) {
-    return std::any_of(mRegisteredArguments.begin(), mRegisteredArguments.end(), [&Name](const RegisteredArgument& Arg) {
-        auto Iter = std::find(Arg.Names.begin(), Arg.Names.end(), Name);
-        return Iter != Arg.Names.end();
-    });
-}
-
-void ArgsParser::ConsumeLongAssignment(const std::string& Arg) {
-    auto Value = Arg.substr(Arg.rfind("=") + 1);
-    auto Name = Arg.substr(2, Arg.rfind("=") - 2);
-    if (!IsRegistered(Name)) {
-        beammp_warn("Argument '" + Name + "' was supplied but isn't a known argument, so it is likely being ignored.");
-    }
-    mFoundArgs.push_back({ Name, Value });
-}
-
-void ArgsParser::ConsumeLongFlag(const std::string& Arg) {
-    auto Name = Arg.substr(2, Arg.rfind("=") - 2);
-    mFoundArgs.push_back({ Name, std::nullopt });
-    if (!IsRegistered(Name)) {
-        beammp_warn("Argument '" + Name + "' was supplied but isn't a known argument, so it is likely being ignored.");
-    }
-}
@@ -1,120 +0,0 @@
-#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;
-}
@@ -1,225 +0,0 @@
-#include "Common.h"
-
-#include "TConsole.h"
-#include <array>
-#include <charconv>
-#include <iostream>
-#include <map>
-#include <regex>
-#include <sstream>
-#include <thread>
-
-#include "CustomAssert.h"
-#include "Http.h"
-
-Application::TSettings Application::Settings = {};
-
-void Application::RegisterShutdownHandler(const TShutdownHandler& Handler) {
-    std::unique_lock Lock(mShutdownHandlersMutex);
-    if (Handler) {
-        mShutdownHandlers.push_front(Handler);
-    }
-}
-
-void Application::GracefullyShutdown() {
-    static bool AlreadyShuttingDown = false;
-    static uint8_t ShutdownAttempts = 0;
-    if (AlreadyShuttingDown) {
-        ++ShutdownAttempts;
-        // hard shutdown at 2 additional tries
-        if (ShutdownAttempts == 2) {
-            beammp_info("hard shutdown forced by multiple shutdown requests");
-            std::exit(0);
-        }
-        beammp_info("already shutting down!");
-        return;
-    } else {
-        AlreadyShuttingDown = true;
-    }
-    beammp_trace("waiting for lock release");
-    std::unique_lock Lock(mShutdownHandlersMutex);
-    beammp_info("please wait while all subsystems are shutting down...");
-    for (size_t i = 0; i < mShutdownHandlers.size(); ++i) {
-        beammp_info("Subsystem " + std::to_string(i + 1) + "/" + std::to_string(mShutdownHandlers.size()) + " shutting down");
-        mShutdownHandlers[i]();
-    }
-}
-
-std::string Application::ServerVersionString() {
-    return mVersion.AsString();
-}
-
-std::array<uint8_t, 3> Application::VersionStrToInts(const std::string& str) {
-    std::array<uint8_t, 3> Version;
-    std::stringstream ss(str);
-    for (uint8_t& i : Version) {
-        std::string Part;
-        std::getline(ss, Part, '.');
-        std::from_chars(&*Part.begin(), &*Part.begin() + Part.size(), i);
-    }
-    return Version;
-}
-
-// FIXME: This should be used by operator< on Version
-bool Application::IsOutdated(const Version& Current, const Version& Newest) {
-    if (Newest.major > Current.major) {
-        return true;
-    } else if (Newest.major == Current.major && Newest.minor > Current.minor) {
-        return true;
-    } else if (Newest.major == Current.major && Newest.minor == Current.minor && Newest.patch > Current.patch) {
-        return true;
-    } else {
-        return false;
-    }
-}
-
-void Application::SetSubsystemStatus(const std::string& Subsystem, Status status) {
-    switch (status) {
-    case Status::Good:
-        beammp_trace("Subsystem '" + Subsystem + "': Good");
-        break;
-    case Status::Bad:
-        beammp_trace("Subsystem '" + Subsystem + "': Bad");
-        break;
-    case Status::Starting:
-        beammp_trace("Subsystem '" + Subsystem + "': Starting");
-        break;
-    case Status::ShuttingDown:
-        beammp_trace("Subsystem '" + Subsystem + "': Shutting down");
-        break;
-    case Status::Shutdown:
-        beammp_trace("Subsystem '" + Subsystem + "': Shutdown");
-        break;
-    }
-    std::unique_lock Lock(mSystemStatusMapMutex);
-    mSystemStatusMap[Subsystem] = status;
-}
-
-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(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 = RemoteVersion.AsString();
-                beammp_warn(std::string(ANSI_YELLOW_BOLD) + "NEW VERSION IS OUT! Please update to the new version (v" + RealVersionString + ") of the BeamMP-Server! Download it here: https://beammp.com/! For a guide on how to update, visit: https://wiki.beammp.com/en/home/server-maintenance#updating-the-server" + std::string(ANSI_RESET));
-            } else {
-                if (FirstTime) {
-                    beammp_info("Server up-to-date!");
-                }
-            }
-            Application::SetSubsystemStatus("UpdateCheck", Application::Status::Good);
-            break;
-        } else {
-            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);
-            }
-        }
-    }
-    if (Application::GetSubsystemStatuses().at("UpdateCheck") == Application::Status::Bad) {
-        if (FirstTime) {
-            beammp_warn("Unable to fetch version info from backend.");
-        }
-    }
-    FirstTime = false;
-}
-
-// thread name stuff
-
-static std::map<std::thread::id, std::string> threadNameMap {};
-static std::mutex ThreadNameMapMutex {};
-
-std::string ThreadName(bool DebugModeOverride) {
-    auto Lock = std::unique_lock(ThreadNameMapMutex);
-    if (DebugModeOverride || Application::Settings.DebugModeEnabled) {
-        auto id = std::this_thread::get_id();
-        if (threadNameMap.find(id) != threadNameMap.end()) {
-            // found
-            return threadNameMap.at(id) + " ";
-        }
-    }
-    return "";
-}
-
-void RegisterThread(const std::string& str) {
-    std::string ThreadId;
-#ifdef BEAMMP_WINDOWS
-    ThreadId = std::to_string(GetCurrentThreadId());
-#elif defined(BEAMMP_APPLE)
-    ThreadId = std::to_string(getpid()); // todo: research if 'getpid()' is a valid, posix compliant alternative to 'gettid()'
-#elif defined(BEAMMP_LINUX)
-    ThreadId = std::to_string(gettid());
-#endif
-    if (Application::Settings.DebugModeEnabled) {
-        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;
-}
-
-Version::Version(uint8_t major, uint8_t minor, uint8_t patch)
-    : major(major)
-    , minor(minor)
-    , patch(patch) { }
-
-Version::Version(const std::array<uint8_t, 3>& v)
-    : Version(v[0], v[1], v[2]) {
-}
-
-std::string Version::AsString() {
-    std::stringstream ss {};
-    ss << int(major) << "." << int(minor) << "." << int(patch);
-    return ss.str();
-}
-
-void LogChatMessage(const std::string& name, int id, const std::string& msg) {
-    std::stringstream ss;
-    ss << ThreadName();
-    ss << "[CHAT] ";
-    if (id != -1) {
-        ss << "(" << id << ") <" << name << "> ";
-    } else {
-        ss << name << "";
-    }
-    ss << msg;
-    Application::Console().Write(ss.str());
-}
-
-std::string GetPlatformAgnosticErrorString() {
-#ifdef BEAMMP_WINDOWS
-    // This will provide us with the error code and an error message, all in one.
-    int err;
-    char msgbuf[256];
-    msgbuf[0] = '\0';
-
-    err = GetLastError();
-
-    FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-        nullptr,
-        err,
-        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-        msgbuf,
-        sizeof(msgbuf),
-        nullptr);
-
-    if (*msgbuf) {
-        return std::to_string(GetLastError()) + " - " + std::string(msgbuf);
-    } else {
-        return std::to_string(GetLastError());
-    }
-#elif defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
-    return std::strerror(errno);
-#endif
-}
@@ -1,35 +0,0 @@
-#include "Compat.h"
-
-#ifndef WIN32
-
-static struct termios old, current;
-
-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 */
-    if (echo) {
-        current.c_lflag |= ECHO; /* set echo mode */
-    } else {
-        current.c_lflag &= ~ECHO; /* set no echo mode */
-    }
-    tcsetattr(0, TCSANOW, &current); /* use these new terminal i/o settings now */
-}
-
-void resetTermios(void) {
-    tcsetattr(0, TCSANOW, &old);
-}
-
-char getch_(int echo) {
-    char ch;
-    initTermios(echo);
-    read(STDIN_FILENO, &ch, 1);
-    resetTermios();
-    return ch;
-}
-
-char _getch(void) {
-    return getch_(0);
-}
-
-#endif // !WIN32
@@ -1,383 +0,0 @@
-#include "Http.h"
-
-#include "Client.h"
-#include "Common.h"
-#include "CustomAssert.h"
-#include "LuaAPI.h"
-#include "httplib.h"
-
-#include <map>
-#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
-
-namespace json = rapidjson;
-
-std::string Http::GET(const std::string& host, int port, const std::string& target, unsigned int* status) {
-    httplib::SSLClient client(host, port);
-    client.enable_server_certificate_verification(false);
-    client.set_address_family(AF_INET);
-    auto res = client.Get(target.c_str());
-    if (res) {
-        if (status) {
-            *status = res->status;
-        }
-        return res->body;
-    } else {
-        return Http::ErrorString;
-    }
-}
-
-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) {
-    httplib::SSLClient client(host, port);
-    client.set_read_timeout(std::chrono::seconds(10));
-    beammp_assert(client.is_valid());
-    client.enable_server_certificate_verification(false);
-    client.set_address_family(AF_INET);
-    auto res = client.Post(target.c_str(), headers, body.c_str(), body.size(), ContentType.c_str());
-    if (res) {
-        if (status) {
-            *status = res->status;
-        }
-        return res->body;
-    } else {
-        beammp_debug("POST failed: " + httplib::to_string(res.error()));
-        return Http::ErrorString;
-    }
-}
-
-// RFC 2616, RFC 7231
-static std::map<size_t, const char*> Map = {
-    { -1, "Invalid Response Code" },
-    { 100, "Continue" },
-    { 101, "Switching Protocols" },
-    { 102, "Processing" },
-    { 103, "Early Hints" },
-    { 200, "OK" },
-    { 201, "Created" },
-    { 202, "Accepted" },
-    { 203, "Non-Authoritative Information" },
-    { 204, "No Content" },
-    { 205, "Reset Content" },
-    { 206, "Partial Content" },
-    { 207, "Multi-Status" },
-    { 208, "Already Reported" },
-    { 226, "IM Used" },
-    { 300, "Multiple Choices" },
-    { 301, "Moved Permanently" },
-    { 302, "Found" },
-    { 303, "See Other" },
-    { 304, "Not Modified" },
-    { 305, "Use Proxy" },
-    { 306, "(Unused)" },
-    { 307, "Temporary Redirect" },
-    { 308, "Permanent Redirect" },
-    { 400, "Bad Request" },
-    { 401, "Unauthorized" },
-    { 402, "Payment Required" },
-    { 403, "Forbidden" },
-    { 404, "Not Found" },
-    { 405, "Method Not Allowed" },
-    { 406, "Not Acceptable" },
-    { 407, "Proxy Authentication Required" },
-    { 408, "Request Timeout" },
-    { 409, "Conflict" },
-    { 410, "Gone" },
-    { 411, "Length Required" },
-    { 412, "Precondition Failed" },
-    { 413, "Payload Too Large" },
-    { 414, "URI Too Long" },
-    { 415, "Unsupported Media Type" },
-    { 416, "Range Not Satisfiable" },
-    { 417, "Expectation Failed" },
-    { 421, "Misdirected Request" },
-    { 422, "Unprocessable Entity" },
-    { 423, "Locked" },
-    { 424, "Failed Dependency" },
-    { 425, "Too Early" },
-    { 426, "Upgrade Required" },
-    { 428, "Precondition Required" },
-    { 429, "Too Many Requests" },
-    { 431, "Request Header Fields Too Large" },
-    { 451, "Unavailable For Legal Reasons" },
-    { 500, "Internal Server Error" },
-    { 501, "Not Implemented" },
-    { 502, "Bad Gateway" },
-    { 503, "Service Unavailable" },
-    { 504, "Gateway Timeout" },
-    { 505, "HTTP Version Not Supported" },
-    { 506, "Variant Also Negotiates" },
-    { 507, "Insufficient Storage" },
-    { 508, "Loop Detected" },
-    { 510, "Not Extended" },
-    { 511, "Network Authentication Required" },
-    // cloudflare status codes
-    { 520, "(CDN) Web Server Returns An Unknown Error" },
-    { 521, "(CDN) Web Server Is Down" },
-    { 522, "(CDN) Connection Timed Out" },
-    { 523, "(CDN) Origin Is Unreachable" },
-    { 524, "(CDN) A Timeout Occurred" },
-    { 525, "(CDN) SSL Handshake Failed" },
-    { 526, "(CDN) Invalid SSL Certificate" },
-    { 527, "(CDN) Railgun Listener To Origin Error" },
-    { 530, "(CDN) 1XXX Internal Error" },
-};
-
-static const char Magic[] = {
-    0x20, 0x2f, 0x5c, 0x5f,
-    0x2f, 0x5c, 0x0a, 0x28,
-    0x20, 0x6f, 0x2e, 0x6f,
-    0x20, 0x29, 0x0a, 0x20,
-    0x3e, 0x20, 0x5e, 0x20,
-    0x3c, 0x0a, 0x00
-};
-
-std::string Http::Status::ToString(int Code) {
-    if (Map.find(Code) != Map.end()) {
-        return Map.at(Code);
-    } else {
-        return std::to_string(Code);
-    }
-}
-
-long Http::Server::Tx509KeypairGenerator::GenerateRandomId() {
-    std::random_device R;
-    std::default_random_engine E1(R());
-    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() {
-    Application::SetSubsystemStatus("HTTPServer", Application::Status::Starting);
-    mThread = std::thread(&Http::Server::THttpServerInstance::operator(), this);
-    mThread.detach();
-}
-
-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;
-    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");
-    });
-    HttpLibServerInstance->Get("/health", [](const httplib::Request&, httplib::Response& res) {
-        size_t SystemsGood = 0;
-        size_t SystemsBad = 0;
-        auto Statuses = Application::GetSubsystemStatuses();
-        for (const auto& NameStatusPair : Statuses) {
-            switch (NameStatusPair.second) {
-            case Application::Status::Starting:
-            case Application::Status::ShuttingDown:
-            case Application::Status::Shutdown:
-            case Application::Status::Good:
-                SystemsGood++;
-                break;
-            case Application::Status::Bad:
-                SystemsBad++;
-                break;
-            }
-        }
-        res.set_content(SystemsBad == 0 ? "0" : "1", "text/plain");
-        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");
-    });
-    HttpLibServerInstance->set_logger([](const httplib::Request& Req, const httplib::Response& Res) {
-        beammp_debug("Http Server: " + Req.method + " " + Req.target + " -> " + std::to_string(Res.status));
-    });
-    Application::SetSubsystemStatus("HTTPServer", Application::Status::Good);
-    auto ret = HttpLibServerInstance->listen(Application::Settings.HTTPServerIP.c_str(), Application::Settings.HTTPServerPort);
-    if (!ret) {
-        beammp_error("Failed to start http server (failed to listen). Please ensure the http server is configured properly in the ServerConfig.toml, or turn it off if you don't need it.");
-    }
-} catch (const std::exception& e) {
-    beammp_error("Failed to start http server. Please ensure the http server is configured properly in the ServerConfig.toml, or turn it off if you don't need it. Error: " + std::string(e.what()));
-}
@@ -1,354 +0,0 @@
-#include "LuaAPI.h"
-#include "Client.h"
-#include "Common.h"
-#include "TLuaEngine.h"
-
-#define SOL_ALL_SAFETIES_ON 1
-#include <sol/sol.hpp>
-
-std::string LuaAPI::LuaToString(const sol::object Value, size_t Indent, bool QuoteStrings) {
-    if (Indent > 80) {
-        return "[[possible recursion, refusing to keep printing]]";
-    }
-    switch (Value.get_type()) {
-    case sol::type::userdata: {
-        std::stringstream ss;
-        ss << "[[userdata: " << Value.as<sol::userdata>().pointer() << "]]";
-        return ss.str();
-    }
-    case sol::type::thread: {
-        std::stringstream ss;
-        ss << "[[thread: " << Value.as<sol::thread>().pointer() << "]] {"
-           << "\n";
-        for (size_t i = 0; i < Indent; ++i) {
-            ss << "\t";
-        }
-        ss << "status: " << std::to_string(int(Value.as<sol::thread>().status())) << "\n}";
-        return ss.str();
-    }
-    case sol::type::lightuserdata: {
-        std::stringstream ss;
-        ss << "[[lightuserdata: " << Value.as<sol::lightuserdata>().pointer() << "]]";
-        return ss.str();
-    }
-    case sol::type::string:
-        if (QuoteStrings) {
-            return "\"" + Value.as<std::string>() + "\"";
-        } else {
-            return Value.as<std::string>();
-        }
-    case sol::type::number: {
-        std::stringstream ss;
-        ss << Value.as<float>();
-        return ss.str();
-    }
-    case sol::type::lua_nil:
-    case sol::type::none:
-        return "<nil>";
-    case sol::type::boolean:
-        return Value.as<bool>() ? "true" : "false";
-    case sol::type::table: {
-        std::stringstream Result;
-        auto Table = Value.as<sol::table>();
-        Result << "[[table: " << Table.pointer() << "]]: {";
-        if (!Table.empty()) {
-            for (const auto& Entry : Table) {
-                Result << "\n";
-                for (size_t i = 0; i < Indent; ++i) {
-                    Result << "\t";
-                }
-                Result << LuaToString(Entry.first, Indent + 1) << ": " << LuaToString(Entry.second, Indent + 1, true) << ",";
-            }
-            Result << "\n";
-        }
-        for (size_t i = 0; i < Indent - 1; ++i) {
-            Result << "\t";
-        }
-        Result << "}";
-        return Result.str();
-    }
-    case sol::type::function: {
-        std::stringstream ss;
-        ss << "[[function: " << Value.as<sol::function>().pointer() << "]]";
-        return ss.str();
-    }
-    default:
-        return "((unprintable type))";
-    }
-}
-
-std::string LuaAPI::MP::GetOSName() {
-#if WIN32
-    return "Windows";
-#elif __linux
-    return "Linux";
-#else
-    return "Other";
-#endif
-}
-
-std::tuple<int, int, int> LuaAPI::MP::GetServerVersion() {
-    return { Application::ServerVersion().major, Application::ServerVersion().minor, Application::ServerVersion().patch };
-}
-
-void LuaAPI::Print(sol::variadic_args Args) {
-    std::string ToPrint = "";
-    for (const auto& Arg : Args) {
-        ToPrint += LuaToString(static_cast<const sol::object>(Arg));
-        ToPrint += "\t";
-    }
-    luaprint(ToPrint);
-}
-
-bool LuaAPI::MP::TriggerClientEvent(int PlayerID, const std::string& EventName, const std::string& Data) {
-    std::string Packet = "E:" + EventName + ":" + Data;
-    if (PlayerID == -1)
-        Engine->Network().SendToAll(nullptr, Packet, true, true);
-    else {
-        auto MaybeClient = GetClient(Engine->Server(), PlayerID);
-        if (!MaybeClient || MaybeClient.value().expired()) {
-            beammp_lua_error("TriggerClientEvent invalid Player ID");
-            return false;
-        }
-        auto c = MaybeClient.value().lock();
-        if (!Engine->Network().Respond(*c, Packet, true)) {
-            beammp_lua_error("Respond failed, dropping client " + std::to_string(PlayerID));
-            Engine->Network().ClientKick(*c, "Disconnected after failing to receive packets");
-            return false;
-        }
-    }
-    return true;
-}
-
-void LuaAPI::MP::DropPlayer(int ID, std::optional<std::string> MaybeReason) {
-    auto MaybeClient = GetClient(Engine->Server(), ID);
-    if (!MaybeClient || MaybeClient.value().expired()) {
-        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, Packet, true, true);
-    } else {
-        auto MaybeClient = GetClient(Engine->Server(), ID);
-        if (MaybeClient && !MaybeClient.value().expired()) {
-            auto c = MaybeClient.value().lock();
-            if (!c->IsSynced())
-                return;
-            LogChatMessage("<Server> (to \"" + c->GetName() + "\")", -1, Message);
-            Engine->Network().Respond(*c, Packet, true);
-        } else {
-            beammp_lua_error("SendChatMessage invalid argument [1] invalid ID");
-        }
-    }
-}
-
-void LuaAPI::MP::RemoveVehicle(int PID, int VID) {
-    auto MaybeClient = GetClient(Engine->Server(), PID);
-    if (!MaybeClient || MaybeClient.value().expired()) {
-        beammp_lua_error("RemoveVehicle invalid Player ID");
-        return;
-    }
-    auto c = MaybeClient.value().lock();
-    if (!c->GetCarData(VID).empty()) {
-        std::string Destroy = "Od:" + std::to_string(PID) + "-" + std::to_string(VID);
-        Engine->Network().SendToAll(nullptr, Destroy, true, true);
-        c->DeleteCar(VID);
-    }
-}
-
-void LuaAPI::MP::Set(int ConfigID, sol::object NewValue) {
-    switch (ConfigID) {
-    case 0: // debug
-        if (NewValue.is<bool>()) {
-            Application::Settings.DebugModeEnabled = NewValue.as<bool>();
-            beammp_info(std::string("Set `Debug` to ") + (Application::Settings.DebugModeEnabled ? "true" : "false"));
-        } 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
-            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
-            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
-            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
-            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
-            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
-            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.");
-        break;
-    }
-}
-
-void LuaAPI::MP::Sleep(size_t Ms) {
-    std::this_thread::sleep_for(std::chrono::milliseconds(Ms));
-}
-
-bool LuaAPI::MP::IsPlayerConnected(int ID) {
-    auto MaybeClient = GetClient(Engine->Server(), ID);
-    if (MaybeClient && !MaybeClient.value().expired()) {
-        return MaybeClient.value().lock()->IsConnected();
-    } else {
-        return false;
-    }
-}
-
-bool LuaAPI::MP::IsPlayerGuest(int ID) {
-    auto MaybeClient = GetClient(Engine->Server(), ID);
-    if (MaybeClient && !MaybeClient.value().expired()) {
-        return MaybeClient.value().lock()->IsGuest();
-    } else {
-        return false;
-    }
-}
-
-void LuaAPI::MP::PrintRaw(sol::variadic_args Args) {
-    std::string ToPrint = "";
-    for (const auto& Arg : Args) {
-        ToPrint += LuaToString(static_cast<const sol::object>(Arg));
-        ToPrint += "\t";
-    }
-    Application::Console().WriteRaw(ToPrint);
-}
-
-int LuaAPI::PanicHandler(lua_State* State) {
-    beammp_lua_error("PANIC: " + sol::stack::get<std::string>(State, 1));
-    return 0;
-}
-
-template <typename FnT, typename... ArgsT>
-static std::pair<bool, std::string> FSWrapper(FnT Fn, ArgsT&&... Args) {
-    std::error_code errc;
-    std::pair<bool, std::string> Result;
-    Fn(std::forward<ArgsT>(Args)..., errc);
-    Result.first = errc == std::error_code {};
-    if (!Result.first) {
-        Result.second = errc.message();
-    }
-    return Result;
-}
-
-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(fs::relative(Path), errc);
-    Result.first = errc == std::error_code {};
-    if (!Result.first) {
-        Result.second = errc.message();
-    }
-    return Result;
-}
-
-std::pair<bool, std::string> LuaAPI::FS::Remove(const std::string& Path) {
-    std::error_code errc;
-    std::pair<bool, std::string> Result;
-    fs::remove(fs::relative(Path), errc);
-    Result.first = errc == std::error_code {};
-    if (!Result.first) {
-        Result.second = errc.message();
-    }
-    return Result;
-}
-
-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(fs::relative(Path), fs::relative(NewPath), errc);
-    Result.first = errc == std::error_code {};
-    if (!Result.first) {
-        Result.second = errc.message();
-    }
-    return Result;
-}
-
-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(fs::relative(Path), fs::relative(NewPath), fs::copy_options::recursive, errc);
-    Result.first = errc == std::error_code {};
-    if (!Result.first) {
-        Result.second = errc.message();
-    }
-    return Result;
-}
-
-bool LuaAPI::FS::Exists(const std::string& Path) {
-    return fs::exists(fs::relative(Path));
-}
-
-std::string LuaAPI::FS::GetFilename(const std::string& Path) {
-    return fs::path(Path).filename().string();
-}
-
-std::string LuaAPI::FS::GetExtension(const std::string& Path) {
-    return fs::path(Path).extension().string();
-}
-
-std::string LuaAPI::FS::GetParentFolder(const std::string& Path) {
-    return fs::path(Path).parent_path().string();
-}
-
-bool LuaAPI::FS::IsDirectory(const std::string& Path) {
-    return fs::is_directory(Path);
-}
-
-bool LuaAPI::FS::IsFile(const std::string& Path) {
-    return fs::is_regular_file(Path);
-}
-
-std::string LuaAPI::FS::ConcatPaths(sol::variadic_args Args) {
-    fs::path Path;
-    for (size_t i = 0; i < Args.size(); ++i) {
-        auto Obj = Args[i];
-        if (!Obj.is<std::string>()) {
-            beammp_lua_error("FS.Concat called with non-string argument");
-            return "";
-        }
-        Path += Obj.as<std::string>();
-        if (i < Args.size() - 1 && !Path.empty()) {
-            Path += fs::path::preferred_separator;
-        }
-    }
-    auto Result = Path.lexically_normal().string();
-    return Result;
-}
@@ -1,62 +0,0 @@
-#include "SignalHandling.h"
-#include "Common.h"
-
-#if defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
-#include <csignal>
-static void UnixSignalHandler(int sig) {
-    switch (sig) {
-    case SIGPIPE:
-        beammp_warn("ignoring SIGPIPE");
-        break;
-    case SIGTERM:
-        beammp_info("gracefully shutting down via SIGTERM");
-        Application::GracefullyShutdown();
-        break;
-    case SIGINT:
-        beammp_info("gracefully shutting down via SIGINT");
-        Application::GracefullyShutdown();
-        break;
-    default:
-        beammp_debug("unhandled signal: " + std::to_string(sig));
-        break;
-    }
-}
-#endif // UNIX
-
-#ifdef BEAMMP_WINDOWS
-#include <windows.h>
-// return TRUE if handled, FALSE if not
-BOOL WINAPI Win32CtrlC_Handler(DWORD CtrlType) {
-    switch (CtrlType) {
-    case CTRL_C_EVENT:
-        beammp_info("gracefully shutting down via CTRL+C");
-        Application::GracefullyShutdown();
-        return TRUE;
-    case CTRL_BREAK_EVENT:
-        beammp_info("gracefully shutting down via CTRL+BREAK");
-        Application::GracefullyShutdown();
-        return TRUE;
-    case CTRL_CLOSE_EVENT:
-        beammp_info("gracefully shutting down via close");
-        Application::GracefullyShutdown();
-        return TRUE;
-    }
-    // we dont care for any others like CTRL_LOGOFF_EVENT and CTRL_SHUTDOWN_EVENT
-    return FALSE;
-}
-#endif // WINDOWS
-
-void SetupSignalHandlers() {
-    // signal handlers for unix#include <windows.h>
-#if defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
-    beammp_trace("registering handlers for signals");
-    signal(SIGPIPE, UnixSignalHandler);
-    signal(SIGTERM, UnixSignalHandler);
-#ifndef DEBUG
-    signal(SIGINT, UnixSignalHandler);
-#endif // DEBUG
-#elif defined(BEAMMP_WINDOWS)
-    beammp_trace("registering handlers for CTRL_*_EVENTs");
-    SetConsoleCtrlHandler(Win32CtrlC_Handler, TRUE);
-#endif
-}
@@ -1,263 +0,0 @@
-#include "Common.h"
-
-#include "TConfig.h"
-#include <fstream>
-#include <iostream>
-#include <istream>
-#include <sstream>
-
-// General
-static constexpr std::string_view StrDebug = "Debug";
-static constexpr std::string_view StrPrivate = "Private";
-static constexpr std::string_view StrPort = "Port";
-static constexpr std::string_view StrMaxCars = "MaxCars";
-static constexpr std::string_view StrMaxPlayers = "MaxPlayers";
-static constexpr std::string_view StrMap = "Map";
-static constexpr std::string_view StrName = "Name";
-static constexpr std::string_view StrDescription = "Description";
-static constexpr std::string_view StrResourceFolder = "ResourceFolder";
-static constexpr std::string_view StrAuthKey = "AuthKey";
-
-// Misc
-static constexpr std::string_view StrSendErrors = "SendErrors";
-static constexpr std::string_view StrSendErrorsMessageEnabled = "SendErrorsShowMessage";
-static constexpr std::string_view StrHideUpdateMessages = "ImScaredOfUpdates";
-
-// HTTP
-static constexpr std::string_view StrHTTPServerEnabled = "HTTPServerEnabled";
-static constexpr std::string_view StrHTTPServerUseSSL = "UseSSL";
-static constexpr std::string_view StrSSLKeyPath = "SSLKeyPath";
-static constexpr std::string_view StrSSLCertPath = "SSLCertPath";
-static constexpr std::string_view StrHTTPServerPort = "HTTPServerPort";
-static constexpr std::string_view StrHTTPServerIP = "HTTPServerIP";
-
-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(mConfigFileName);
-    }
-    if (!mFailed) {
-        if (fs::exists("Server.cfg")) {
-            beammp_warn("An old \"Server.cfg\" file still exists. Please note that this is no longer used. Instead, \"" + std::string(mConfigFileName) + "\" is used. You can safely delete the \"Server.cfg\".");
-        }
-        ParseFromFile(mConfigFileName);
-    }
-}
-
-template <typename CommentsT>
-void SetComment(CommentsT& Comments, const std::string& Comment) {
-    Comments.clear();
-    Comments.push_back(Comment);
-}
-
-/**
- * @brief Writes out the loaded application state into ServerConfig.toml
- *
- * This writes out the current state of application settings that are
- * applied to the server instance (i.e. the current application settings loaded in the server).
- * If the state of the application settings changes during runtime,
- * call this function whenever something about the config changes
- * whether it is in TConfig.cpp or the configuration file.
- */
-void TConfig::FlushToFile() {
-    // auto data = toml::parse<toml::preserve_comments>(mConfigFileName);
-    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"][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;
-    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;
-    // 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(), " You can turn on/off the SendErrors message you get on startup here");
-    data["Misc"][StrSendErrorsMessageEnabled.data()] = Application::Settings.SendErrorsMessageEnabled;
-    SetComment(data["Misc"][StrSendErrorsMessageEnabled.data()].comments(), " If SendErrors is `true`, the server will send helpful info about crashes and other issues back to the BeamMP developers. This info may include your config, who is on your server at the time of the error, and similar general information. This kind of data is vital in helping us diagnose and fix issues faster. This has no impact on server performance. You can opt-out of this system by setting this to `false`");
-    // HTTP
-    data["HTTP"][StrSSLKeyPath.data()] = Application::Settings.SSLKeyPath;
-    data["HTTP"][StrSSLCertPath.data()] = Application::Settings.SSLCertPath;
-    data["HTTP"][StrHTTPServerPort.data()] = Application::Settings.HTTPServerPort;
-    SetComment(data["HTTP"][StrHTTPServerIP.data()].comments(), " Which IP to listen on. Pick 0.0.0.0 for a public-facing server with no specific IP, and 127.0.0.1 or 'localhost' for a local server.");
-    data["HTTP"][StrHTTPServerIP.data()] = Application::Settings.HTTPServerIP;
-    data["HTTP"][StrHTTPServerUseSSL.data()] = Application::Settings.HTTPServerUseSSL;
-    SetComment(data["HTTP"][StrHTTPServerUseSSL.data()].comments(), " Recommended to have enabled for servers which face the internet. With SSL the server will serve https and requires valid key and cert files");
-    data["HTTP"][StrHTTPServerEnabled.data()] = Application::Settings.HTTPServerEnabled;
-    SetComment(data["HTTP"][StrHTTPServerEnabled.data()].comments(), " Enables the internal HTTP server");
-    std::stringstream Ss;
-    Ss << "# This is the BeamMP-Server config file.\n"
-          "# Help & Documentation: `https://wiki.beammp.com/en/home/server-maintenance`\n"
-          "# IMPORTANT: Fill in the AuthKey with the key you got from `https://beammp.com/k/dashboard` on the left under \"Keys\"\n"
-       << data;
-    auto File = std::fopen(mConfigFileName.c_str(), "w+");
-    if (!File) {
-        beammp_error("Failed to create/write to config file: " + GetPlatformAgnosticErrorString());
-        throw std::runtime_error("Failed to create/write to config file");
-    }
-    auto Str = Ss.str();
-    auto N = std::fwrite(Str.data(), sizeof(char), Str.size(), File);
-    if (N != Str.size()) {
-        beammp_error("Failed to write to config file properly, config file might be misshapen");
-    }
-    std::fclose(File);
-}
-
-void TConfig::CreateConfigFile(std::string_view name) {
-    // build from old config Server.cfg
-
-    try {
-        if (fs::exists("Server.cfg")) {
-            // parse it (this is weird and bad and should be removed in some future version)
-            ParseOldFormat();
-        }
-    } catch (const std::exception& e) {
-        beammp_error("an error occurred and was ignored during config transfer: " + std::string(e.what()));
-    }
-
-    FlushToFile();
-}
-
-void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, std::string& OutValue) {
-    if (Table[Category.c_str()][Key.data()].is_string()) {
-        OutValue = Table[Category.c_str()][Key.data()].as_string();
-    }
-}
-
-void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, bool& OutValue) {
-    if (Table[Category.c_str()][Key.data()].is_boolean()) {
-        OutValue = Table[Category.c_str()][Key.data()].as_boolean();
-    }
-}
-
-void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, int& OutValue) {
-    if (Table[Category.c_str()][Key.data()].is_integer()) {
-        OutValue = Table[Category.c_str()][Key.data()].as_integer();
-    }
-}
-
-void TConfig::ParseFromFile(std::string_view name) {
-    try {
-        toml::value data = toml::parse<toml::preserve_comments>(name.data());
-        // GENERAL
-        TryReadValue(data, "General", StrDebug, Application::Settings.DebugModeEnabled);
-        TryReadValue(data, "General", StrPrivate, Application::Settings.Private);
-        TryReadValue(data, "General", StrPort, Application::Settings.Port);
-        TryReadValue(data, "General", StrMaxCars, Application::Settings.MaxCars);
-        TryReadValue(data, "General", StrMaxPlayers, Application::Settings.MaxPlayers);
-        TryReadValue(data, "General", StrMap, Application::Settings.MapName);
-        TryReadValue(data, "General", StrName, Application::Settings.ServerName);
-        TryReadValue(data, "General", StrDescription, Application::Settings.ServerDesc);
-        TryReadValue(data, "General", StrResourceFolder, Application::Settings.Resource);
-        TryReadValue(data, "General", StrAuthKey, Application::Settings.Key);
-        // Misc
-        TryReadValue(data, "Misc", StrSendErrors, Application::Settings.SendErrors);
-        TryReadValue(data, "Misc", StrHideUpdateMessages, Application::Settings.HideUpdateMessages);
-        TryReadValue(data, "Misc", StrSendErrorsMessageEnabled, Application::Settings.SendErrorsMessageEnabled);
-        // HTTP
-        TryReadValue(data, "HTTP", StrSSLKeyPath, Application::Settings.SSLKeyPath);
-        TryReadValue(data, "HTTP", StrSSLCertPath, Application::Settings.SSLCertPath);
-        TryReadValue(data, "HTTP", StrHTTPServerPort, Application::Settings.HTTPServerPort);
-        TryReadValue(data, "HTTP", StrHTTPServerIP, Application::Settings.HTTPServerIP);
-        TryReadValue(data, "HTTP", StrHTTPServerEnabled, Application::Settings.HTTPServerEnabled);
-        TryReadValue(data, "HTTP", StrHTTPServerUseSSL, Application::Settings.HTTPServerUseSSL);
-    } catch (const std::exception& err) {
-        beammp_error("Error parsing config file value: " + std::string(err.what()));
-        mFailed = true;
-        Application::SetSubsystemStatus("Config", Application::Status::Bad);
-        return;
-    }
-    PrintDebug();
-
-    // Update in any case
-    FlushToFile();
-    // all good so far, let's check if there's a key
-    if (Application::Settings.Key.empty()) {
-        beammp_error("No AuthKey specified in the \"" + std::string(mConfigFileName) + "\" file. Please get an AuthKey, enter it into the config file, and restart this server.");
-        Application::SetSubsystemStatus("Config", Application::Status::Bad);
-        mFailed = true;
-        return;
-    }
-    Application::SetSubsystemStatus("Config", Application::Status::Good);
-    if (Application::Settings.Key.size() != 36) {
-        beammp_warn("AuthKey specified is the wrong length and likely isn't valid.");
-    }
-}
-
-void TConfig::PrintDebug() {
-    beammp_debug(std::string(StrDebug) + ": " + std::string(Application::Settings.DebugModeEnabled ? "true" : "false"));
-    beammp_debug(std::string(StrPrivate) + ": " + std::string(Application::Settings.Private ? "true" : "false"));
-    beammp_debug(std::string(StrPort) + ": " + std::to_string(Application::Settings.Port));
-    beammp_debug(std::string(StrMaxCars) + ": " + std::to_string(Application::Settings.MaxCars));
-    beammp_debug(std::string(StrMaxPlayers) + ": " + std::to_string(Application::Settings.MaxPlayers));
-    beammp_debug(std::string(StrMap) + ": \"" + Application::Settings.MapName + "\"");
-    beammp_debug(std::string(StrName) + ": \"" + Application::Settings.ServerName + "\"");
-    beammp_debug(std::string(StrDescription) + ": \"" + Application::Settings.ServerDesc + "\"");
-    beammp_debug(std::string(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()) + "");
-}
-
-void TConfig::ParseOldFormat() {
-    std::ifstream File("Server.cfg");
-    // read all, strip comments
-    std::string Content;
-    for (;;) {
-        std::string Line;
-        std::getline(File, Line);
-        if (!Line.empty() && Line.at(0) != '#') {
-            Line = Line.substr(0, Line.find_first_of('#'));
-            Content += Line + "\n";
-        }
-        if (!File.good()) {
-            break;
-        }
-    }
-    std::stringstream Str(Content);
-    std::string Key, Ignore, Value;
-    for (;;) {
-        Str >> Key >> std::ws >> Ignore >> std::ws;
-        std::getline(Str, Value);
-        if (Str.eof()) {
-            break;
-        }
-        std::stringstream ValueStream(Value);
-        ValueStream >> std::ws; // strip leading whitespace if any
-        Value = ValueStream.str();
-        if (Key == "Debug") {
-            Application::Settings.DebugModeEnabled = Value.find("true") != std::string::npos;
-        } else if (Key == "Private") {
-            Application::Settings.Private = Value.find("true") != std::string::npos;
-        } else if (Key == "Port") {
-            ValueStream >> Application::Settings.Port;
-        } else if (Key == "Cars") {
-            ValueStream >> Application::Settings.MaxCars;
-        } else if (Key == "MaxPlayers") {
-            ValueStream >> Application::Settings.MaxPlayers;
-        } else if (Key == "Map") {
-            Application::Settings.MapName = Value.substr(1, Value.size() - 3);
-        } else if (Key == "Name") {
-            Application::Settings.ServerName = Value.substr(1, Value.size() - 3);
-        } else if (Key == "Desc") {
-            Application::Settings.ServerDesc = Value.substr(1, Value.size() - 3);
-        } else if (Key == "use") {
-            Application::Settings.Resource = Value.substr(1, Value.size() - 3);
-        } else if (Key == "AuthKey") {
-            Application::Settings.Key = Value.substr(1, Value.size() - 3);
-        } else {
-            beammp_warn("unknown key in old auth file (ignored): " + Key);
-        }
-        Str >> std::ws;
-    }
-}
@@ -1,446 +0,0 @@
-#include "TConsole.h"
-#include "Common.h"
-#include "Compat.h"
-
-#include "Client.h"
-#include "CustomAssert.h"
-#include "LuaAPI.h"
-#include "TLuaEngine.h"
-
-#include <ctime>
-#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;
-}
-
-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);
-    }));
-    S.erase(std::find_if(S.rbegin(), S.rend(), [](unsigned char ch) {
-        return !std::isspace(ch);
-    }).base(),
-        S.end());
-    return S;
-}
-
-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);
-    char buf[30];
-    std::string date;
-    if (Application::Settings.DebugModeEnabled) {
-        std::strftime(buf, sizeof(buf), "[%d/%m/%y %T.", local_tm);
-        date += buf;
-        auto seconds = std::chrono::time_point_cast<std::chrono::seconds>(now);
-        auto fraction = now - seconds;
-        size_t ms = std::chrono::duration_cast<std::chrono::milliseconds>(fraction).count();
-        char fracstr[5];
-        std::sprintf(fracstr, "%03lu", ms);
-        date += fracstr;
-        date += "] ";
-    } else {
-        std::strftime(buf, sizeof(buf), "[%d/%m/%y %T] ", local_tm);
-        date += buf;
-    }
-
-    return date;
-}
-
-void TConsole::BackupOldLog() {
-    fs::path Path = "Server.log";
-    if (fs::exists(Path)) {
-        auto OldLog = Path.filename().stem().string() + ".old.log";
-        try {
-            fs::rename(Path, OldLog);
-            beammp_debug("renamed old log file to '" + OldLog + "'");
-        } catch (const std::exception& e) {
-            beammp_warn(e.what());
-        }
-        /*
-        int err = 0;
-        zip* z = zip_open("ServerLogs.zip", ZIP_CREATE, &err);
-        if (!z) {
-            std::cerr << GetPlatformAgnosticErrorString() << std::endl;
-            return;
-        }
-        FILE* File = std::fopen(Path.string().c_str(), "r");
-        if (!File) {
-            std::cerr << GetPlatformAgnosticErrorString() << std::endl;
-            return;
-        }
-        std::vector<uint8_t> Buffer;
-        Buffer.resize(fs::file_size(Path));
-        std::fread(Buffer.data(), 1, Buffer.size(), File);
-        std::fclose(File);
-
-        auto s = zip_source_buffer(z, Buffer.data(), Buffer.size(), 0);
-
-        auto TimePoint = fs::last_write_time(Path);
-        auto Secs = TimePoint.time_since_epoch().count();
-        auto MyTimeT = std::time(&Secs);
-
-        std::string NewName = Path.stem().string();
-        NewName += "_";
-        std::string Time;
-        Time.resize(32);
-        size_t n = strftime(Time.data(), Time.size(), "%F_%H.%M.%S", localtime(&MyTimeT));
-        Time.resize(n);
-        NewName += Time;
-        NewName += ".log";
-
-        zip_file_add(z, NewName.c_str(), s, 0);
-        zip_close(z);
-    */
-    }
-}
-
-void TConsole::StartLoggingToFile() {
-    mLogFileStream.open("Server.log");
-    Application::Console().Internal().on_write = [this](const std::string& ToWrite) {
-        // TODO: Sanitize by removing all ansi escape codes (vt100)
-        std::unique_lock Lock(mLogFileStreamMtx);
-        mLogFileStream.write(ToWrite.c_str(), ToWrite.size());
-        mLogFileStream.write("\n", 1);
-        mLogFileStream.flush();
-    };
-}
-
-void TConsole::ChangeToLuaConsole(const std::string& LuaStateId) {
-    if (!mIsLuaConsole) {
-        if (!mLuaEngine) {
-            beammp_error("Lua engine not initialized yet, please wait and try again");
-            return;
-        }
-        mLuaEngine->EnsureStateExists(mDefaultStateId, "Console");
-        mStateId = LuaStateId;
-        mIsLuaConsole = true;
-        if (mStateId != mDefaultStateId) {
-            Application::Console().WriteRaw("Entered Lua console for state '" + mStateId + "'. To exit, type `exit()`");
-            mCommandline.set_prompt("lua @" + LuaStateId + "> ");
-        } else {
-            Application::Console().WriteRaw("Entered Lua console. To exit, type `exit()`");
-            mCommandline.set_prompt("lua> ");
-        }
-        mCachedRegularHistory = mCommandline.history();
-        mCommandline.set_history(mCachedLuaHistory);
-    }
-}
-
-void TConsole::ChangeToRegularConsole() {
-    if (mIsLuaConsole) {
-        mIsLuaConsole = false;
-        if (mStateId != mDefaultStateId) {
-            Application::Console().WriteRaw("Left Lua console for state '" + mStateId + "'.");
-        } else {
-            Application::Console().WriteRaw("Left Lua console.");
-        }
-        mCachedLuaHistory = mCommandline.history();
-        mCommandline.set_history(mCachedRegularHistory);
-        mCommandline.set_prompt("> ");
-        mStateId = mDefaultStateId;
-    }
-}
-
-void TConsole::Command_Lua(const std::string& cmd) {
-    if (cmd.size() > 3) {
-        auto NewStateId = cmd.substr(4);
-        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 {
-        ChangeToLuaConsole(mDefaultStateId);
-    }
-}
-
-void TConsole::Command_Help(const std::string&) {
-    static constexpr const char* sHelpString = R"(
-    Commands:
-        help                    displays this help
-        exit                    shuts down the server
-        kick <name> [reason]    kicks specified player with an optional reason
-        list                    lists all players and info about them
-        say <message>           sends the message to all players in chat
-        lua [state id]          switches to lua, optionally into a specific state id's lua
-        status                  how the server is doing and what it's up to)";
-    Application::Console().WriteRaw("BeamMP-Server Console: " + std::string(sHelpString));
-}
-
-void TConsole::Command_Kick(const std::string& cmd) {
-    if (cmd.size() > 4) {
-        auto Name = cmd.substr(5);
-        std::string Reason = "Kicked by server console";
-        auto SpacePos = Name.find(' ');
-        if (SpacePos != Name.npos) {
-            Reason = Name.substr(SpacePos + 1);
-            Name = cmd.substr(5, cmd.size() - Reason.size() - 5 - 1);
-        }
-        beammp_trace("attempt to kick '" + Name + "' for '" + Reason + "'");
-        bool Kicked = false;
-        auto NameCompare = [](std::string Name1, std::string Name2) -> bool {
-            std::for_each(Name1.begin(), Name1.end(), [](char& c) { c = tolower(c); });
-            std::for_each(Name2.begin(), Name2.end(), [](char& c) { c = tolower(c); });
-            return StringStartsWith(Name1, Name2) || StringStartsWith(Name2, Name1);
-        };
-        mLuaEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
-            if (!Client.expired()) {
-                auto locked = Client.lock();
-                if (NameCompare(locked->GetName(), Name)) {
-                    mLuaEngine->Network().ClientKick(*locked, Reason);
-                    Kicked = true;
-                    return false;
-                }
-            }
-            return 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 + "'.");
-        }
-    }
-}
-
-void TConsole::Command_Say(const std::string& cmd) {
-    if (cmd.size() > 3) {
-        auto Message = cmd.substr(4);
-        LuaAPI::MP::SendChatMessage(-1, Message);
-    }
-}
-
-void TConsole::Command_List(const std::string&) {
-    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([&](std::weak_ptr<TClient> Client) -> bool {
-            if (!Client.expired()) {
-                auto locked = Client.lock();
-                ss << std::left << std::setw(25) << locked->GetName()
-                   << std::setw(6) << locked->GetID()
-                   << std::setw(6) << locked->GetCarCount() << "\n";
-            }
-            return true;
-        });
-        auto Str = ss.str();
-        Application::Console().WriteRaw(Str.substr(0, Str.size() - 1));
-    }
-}
-
-void TConsole::Command_Status(const std::string&) {
-    std::stringstream Status;
-
-    size_t CarCount = 0;
-    size_t ConnectedCount = 0;
-    size_t GuestCount = 0;
-    size_t SyncedCount = 0;
-    size_t SyncingCount = 0;
-    size_t MissedPacketQueueSum = 0;
-    int LargestSecondsSinceLastPing = 0;
-    mLuaEngine->Server().ForEachClient([&](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;
-    size_t SystemsShuttingDown = 0;
-    size_t SystemsShutdown = 0;
-    std::string SystemsBadList {};
-    std::string SystemsGoodList {};
-    std::string SystemsStartingList {};
-    std::string SystemsShuttingDownList {};
-    std::string SystemsShutdownList {};
-    auto Statuses = Application::GetSubsystemStatuses();
-    for (const auto& NameStatusPair : Statuses) {
-        switch (NameStatusPair.second) {
-        case Application::Status::Good:
-            SystemsGood++;
-            SystemsGoodList += NameStatusPair.first + ", ";
-            break;
-        case Application::Status::Bad:
-            SystemsBad++;
-            SystemsBadList += NameStatusPair.first + ", ";
-            break;
-        case Application::Status::Starting:
-            SystemsStarting++;
-            SystemsStartingList += NameStatusPair.first + ", ";
-            break;
-        case Application::Status::ShuttingDown:
-            SystemsShuttingDown++;
-            SystemsShuttingDownList += NameStatusPair.first + ", ";
-            break;
-        case Application::Status::Shutdown:
-            SystemsShutdown++;
-            SystemsShutdownList += NameStatusPair.first + ", ";
-            break;
-        }
-    }
-    // remove ", " at the end
-    SystemsBadList = SystemsBadList.substr(0, SystemsBadList.size() - 2);
-    SystemsGoodList = SystemsGoodList.substr(0, SystemsGoodList.size() - 2);
-    SystemsStartingList = SystemsStartingList.substr(0, SystemsStartingList.size() - 2);
-    SystemsShuttingDownList = SystemsShuttingDownList.substr(0, SystemsShuttingDownList.size() - 2);
-    SystemsShutdownList = SystemsShutdownList.substr(0, SystemsShutdownList.size() - 2);
-
-    auto ElapsedTime = mLuaEngine->Server().UptimeTimer.GetElapsedTime();
-
-    Status << "BeamMP-Server Status:\n"
-           << "\tTotal Players:             " << mLuaEngine->Server().ClientCount() << "\n"
-           << "\tSyncing Players:           " << SyncingCount << "\n"
-           << "\tSynced Players:            " << SyncedCount << "\n"
-           << "\tConnected Players:         " << ConnectedCount << "\n"
-           << "\tGuests:                    " << GuestCount << "\n"
-           << "\tCars:                      " << CarCount << "\n"
-           << "\tUptime:                    " << ElapsedTime << "ms (~" << size_t(ElapsedTime / 1000.0 / 60.0 / 60.0) << "h) \n"
-           << "\tLua:\n"
-           << "\t\tQueued results to check:     " << mLuaEngine->GetResultsToCheckSize() << "\n"
-           << "\t\tStates:                      " << mLuaEngine->GetLuaStateCount() << "\n"
-           << "\t\tEvent timers:                " << mLuaEngine->GetTimedEventsCount() << "\n"
-           << "\t\tEvent handlers:              " << mLuaEngine->GetRegisteredEventHandlerCount() << "\n"
-           << "\tSubsystems:\n"
-           << "\t\tGood/Starting/Bad:           " << SystemsGood << "/" << SystemsStarting << "/" << SystemsBad << "\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\tShutdown:                    [ " << SystemsShutdownList << " ]\n"
-           << "";
-
-    Application::Console().WriteRaw(Status.str());
-}
-
-void TConsole::RunAsCommand(const std::string& cmd, bool IgnoreNotACommand) {
-    auto FutureIsNonNil =
-        [](const std::shared_ptr<TLuaResult>& Future) {
-            if (!Future->Error && Future->Result.valid()) {
-                auto Type = Future->Result.get_type();
-                return Type != sol::type::lua_nil && Type != sol::type::none;
-            }
-            return false;
-        };
-    std::vector<std::shared_ptr<TLuaResult>> NonNilFutures;
-    { // Futures scope
-        auto Futures = mLuaEngine->TriggerEvent("onConsoleInput", "", cmd);
-        TLuaEngine::WaitForAll(Futures, std::chrono::seconds(5));
-        size_t Count = 0;
-        for (auto& Future : Futures) {
-            if (!Future->Error) {
-                ++Count;
-            }
-        }
-        for (const auto& Future : Futures) {
-            if (FutureIsNonNil(Future)) {
-                NonNilFutures.push_back(Future);
-            }
-        }
-    }
-    if (NonNilFutures.size() == 0) {
-        if (!IgnoreNotACommand) {
-            Application::Console().WriteRaw("Error: Unknown command: '" + cmd + "'. Type 'help' to see a list of valid commands.");
-        }
-    } else {
-        std::stringstream Reply;
-        if (NonNilFutures.size() > 1) {
-            for (size_t i = 0; i < NonNilFutures.size(); ++i) {
-                Reply << NonNilFutures[i]->StateId << ": \n"
-                      << LuaAPI::LuaToString(NonNilFutures[i]->Result);
-                if (i < NonNilFutures.size() - 1) {
-                    Reply << "\n";
-                }
-            }
-        } else {
-            Reply << LuaAPI::LuaToString(NonNilFutures[0]->Result);
-        }
-        Application::Console().WriteRaw(Reply.str());
-    }
-}
-
-TConsole::TConsole() {
-    mCommandline.enable_history();
-    mCommandline.set_history_limit(20);
-    mCommandline.set_prompt("> ");
-    BackupOldLog();
-    mCommandline.on_command = [this](Commandline& c) {
-        try {
-            auto cmd = c.get_command();
-            cmd = TrimString(cmd);
-            mCommandline.write(mCommandline.prompt() + cmd);
-            if (mIsLuaConsole) {
-                if (!mLuaEngine) {
-                    beammp_info("Lua not started yet, please try again in a second");
-                } else if (cmd == "exit()") {
-                    ChangeToRegularConsole();
-                } else {
-                    auto Future = mLuaEngine->EnqueueScript(mStateId, { std::make_shared<std::string>(cmd), "", "" });
-                    while (!Future->Ready) {
-                        std::this_thread::yield(); // TODO: Add a timeout
-                    }
-                    if (Future->Error) {
-                        beammp_lua_error(Future->ErrorMessage);
-                    }
-                }
-            } else {
-                if (!mLuaEngine) {
-                    beammp_error("Attempted to run a command before Lua engine started. Please wait and try again.");
-                } else if (cmd == "exit") {
-                    beammp_info("gracefully shutting down");
-                    Application::GracefullyShutdown();
-                } else if (StringStartsWith(cmd, "lua")) {
-                    Command_Lua(cmd);
-                } else if (StringStartsWith(cmd, "help")) {
-                    RunAsCommand(cmd, true);
-                    Command_Help(cmd);
-                } else if (StringStartsWith(cmd, "kick")) {
-                    RunAsCommand(cmd, true);
-                    Command_Kick(cmd);
-                } 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.");
-        }
-    };
-}
-
-void TConsole::Write(const std::string& str) {
-    auto ToWrite = GetDate() + str;
-    mCommandline.write(ToWrite);
-}
-
-void TConsole::WriteRaw(const std::string& str) {
-    mCommandline.write(str);
-}
-
-void TConsole::InitializeLuaConsole(TLuaEngine& Engine) {
-    mLuaEngine = &Engine;
-}
@@ -1,184 +0,0 @@
-#include "THeartbeatThread.h"
-
-#include "Client.h"
-#include "Http.h"
-//#include "SocketIO.h"
-#include <rapidjson/document.h>
-#include <rapidjson/rapidjson.h>
-#include <sstream>
-
-namespace json = rapidjson;
-
-void THeartbeatThread::operator()() {
-    RegisterThread("Heartbeat");
-    std::string Body;
-    std::string T;
-
-    // these are "hot-change" related variables
-    static std::string Last;
-
-    static std::chrono::high_resolution_clock::time_point LastNormalUpdateTime = std::chrono::high_resolution_clock::now();
-    bool isAuth = false;
-    size_t UpdateReminderCounter = 0;
-    while (!mShutdown) {
-        ++UpdateReminderCounter;
-        Body = GenerateCall();
-        // a hot-change occurs when a setting has changed, to update the backend of that change.
-        auto Now = std::chrono::high_resolution_clock::now();
-        bool Unchanged = Last == Body;
-        auto TimePassed = (Now - LastNormalUpdateTime);
-        auto Threshold = Unchanged ? 30 : 5;
-        if (TimePassed < std::chrono::seconds(Threshold)) {
-            std::this_thread::sleep_for(std::chrono::milliseconds(100));
-            continue;
-        }
-        beammp_debug("heartbeat (after " + std::to_string(std::chrono::duration_cast<std::chrono::seconds>(TimePassed).count()) + "s)");
-
-        Last = Body;
-        LastNormalUpdateTime = Now;
-        if (!Application::Settings.CustomIP.empty()) {
-            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;
-
-        json::Document Doc;
-        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()) {
-                beammp_debug("Failed to contact backend at " + Url + " (this is not an error).");
-                beammp_trace("Response was: " + T);
-                Sentry.SetContext("JSON Response", { { "reponse", T } });
-                SentryReportError(Url + Target, ResponseCode);
-            } else if (ResponseCode != 200) {
-                SentryReportError(Url + Target, ResponseCode);
-            } else {
-                // all ok
-                Ok = true;
-                break;
-            }
-            std::this_thread::sleep_for(std::chrono::milliseconds(500));
-        }
-        std::string Status {};
-        std::string Code {};
-        std::string Message {};
-        const auto StatusKey = "status";
-        const auto CodeKey = "code";
-        const auto MessageKey = "msg";
-
-        if (Ok) {
-            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) {
-                beammp_warn("Backend failed to respond to a heartbeat. Your server may temporarily disappear from the server list. This is not an error, and will likely resolve itself soon. Direct connect will still work.");
-            }
-        }
-
-        if (Ok && !isAuth) {
-            if (Status == "2000") {
-                beammp_info(("Authenticated!"));
-                isAuth = true;
-            } else if (Status == "200") {
-                beammp_info(("Resumed authenticated session!"));
-                isAuth = true;
-            } else {
-                if (Message.empty()) {
-                    Message = "Backend didn't provide a reason";
-                }
-                beammp_error("Backend REFUSED the auth key. " + Message);
-            }
-        }
-        if (isAuth) {
-            Application::SetSubsystemStatus("Heartbeat", Application::Status::Good);
-        }
-        if (!Application::Settings.HideUpdateMessages && UpdateReminderCounter % 5) {
-            Application::CheckForUpdates();
-        }
-    }
-}
-
-std::string THeartbeatThread::GenerateCall() {
-    std::stringstream Ret;
-
-    Ret << "uuid=" << Application::Settings.Key
-        << "&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=" << Application::ClientVersionString()
-        << "&name=" << Application::Settings.ServerName
-        << "&modlist=" << mResourceManager.TrimmedList()
-        << "&modstotalsize=" << mResourceManager.MaxModSize()
-        << "&modstotal=" << mResourceManager.ModsLoaded()
-        << "&playerslist=" << GetPlayers()
-        << "&desc=" << Application::Settings.ServerDesc;
-    return Ret.str();
-}
-THeartbeatThread::THeartbeatThread(TResourceManager& ResourceManager, TServer& Server)
-    : 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);
-    });
-    Start();
-}
-std::string THeartbeatThread::GetPlayers() {
-    std::string Return;
-    mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
-        ReadLock Lock(mServer.GetClientMutex());
-        if (!ClientPtr.expired()) {
-            Return += ClientPtr.lock()->GetName() + ";";
-        }
-        return true;
-    });
-    return Return;
-}
-/*THeartbeatThread::~THeartbeatThread() {
-}*/
@@ -1,835 +0,0 @@
-#include "TLuaEngine.h"
-#include "Client.h"
-#include "CustomAssert.h"
-#include "Http.h"
-#include "LuaAPI.h"
-#include "TLuaPlugin.h"
-
-#include <chrono>
-#include <condition_variable>
-#include <httplib.h>
-#include <random>
-#include <thread>
-#include <tuple>
-
-TLuaEngine* LuaAPI::MP::Engine;
-
-TLuaEngine::TLuaEngine()
-    : 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);
-    }
-    fs::path Path = fs::path(Application::Settings.Resource) / "Server";
-    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);
-    });
-    Start();
-}
-
-void TLuaEngine::operator()() {
-    RegisterThread("LuaEngine");
-    Application::SetSubsystemStatus("LuaEngine", Application::Status::Good);
-    // lua engine main thread
-    CollectAndInitPlugins();
-    // now call all onInit's
-    auto Futures = TriggerEvent("onInit", "");
-    WaitForAll(Futures, std::chrono::seconds(5));
-    for (const auto& Future : Futures) {
-        if (Future->Error && Future->ErrorMessage != BeamMPFnNotFoundError) {
-            beammp_lua_error("Calling \"onInit\" on \"" + Future->StateId + "\" failed: " + Future->ErrorMessage);
-        }
-    }
-
-    auto ResultCheckThread = std::thread([&] {
-        RegisterThread("ResultCheckThread");
-        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) {
-                        return true;
-                    } else if (Ptr->Error) {
-                        if (Ptr->ErrorMessage != BeamMPFnNotFoundError) {
-                            beammp_lua_error(Ptr->Function + ": " + Ptr->ErrorMessage);
-                        }
-                        return true;
-                    }
-                    return false;
-                });
-            }
-        }
-    });
-    // event loop
-    auto Before = std::chrono::high_resolution_clock::now();
-    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) {
-                if (Timer.Expired()) {
-                    auto LastCompletionBeforeReset = Timer.LastCompletion;
-                    Timer.Reset();
-                    auto Handlers = GetEventHandlersForState(Timer.EventName, Timer.StateId);
-                    std::unique_lock StateLock(mLuaStatesMutex);
-                    std::unique_lock Lock2(mResultsToCheckMutex);
-                    for (auto& Handler : Handlers) {
-                        auto Res = mLuaStates[Timer.StateId]->EnqueueFunctionCallFromCustomEvent(Handler, {}, Timer.EventName, Timer.Strategy);
-                        if (Res) {
-                            mResultsToCheck.push_back(Res);
-                            mResultsToCheckCond.notify_one();
-                        } else {
-                            // "revert" reset
-                            Timer.LastCompletion = LastCompletionBeforeReset;
-                            // beammp_trace("Reverted reset of \"" + Timer.EventName + "\" timer");
-                            // no need to try to enqueue more handlers for this event (they will all fail)
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-        const auto Expected = std::chrono::milliseconds(10);
-        if (auto Diff = std::chrono::high_resolution_clock::now() - Before;
-            Diff < Expected) {
-            std::this_thread::sleep_for(Expected - Diff);
-        } else {
-            beammp_trace("Event loop cannot keep up! Running " + std::to_string(Diff.count()) + "s behind");
-        }
-        Before = std::chrono::high_resolution_clock::now();
-    }
-
-    if (ResultCheckThread.joinable()) {
-        ResultCheckThread.join();
-    }
-}
-
-size_t TLuaEngine::CalculateMemoryUsage() {
-    size_t Usage = 0;
-    std::unique_lock Lock(mLuaStatesMutex);
-    for (auto& State : mLuaStates) {
-        Usage += State.second->State().memory_used();
-    }
-    return Usage;
-}
-
-sol::state_view TLuaEngine::GetStateForPlugin(const fs::path& PluginPath) {
-    for (const auto& Plugin : mLuaPlugins) {
-        if (fs::equivalent(Plugin->GetFolder(), PluginPath)) {
-            std::unique_lock Lock(mLuaStatesMutex);
-            return mLuaStates.at(Plugin->GetConfig().StateId)->State();
-        }
-    }
-    beammp_assert_not_reachable();
-    return mLuaStates.begin()->second->State();
-}
-
-TLuaStateId TLuaEngine::GetStateIDForPlugin(const fs::path& PluginPath) {
-    for (const auto& Plugin : mLuaPlugins) {
-        if (fs::equivalent(Plugin->GetFolder(), PluginPath)) {
-            std::unique_lock Lock(mLuaStatesMutex);
-            return Plugin->GetConfig().StateId;
-        }
-    }
-    beammp_assert_not_reachable();
-    return "";
-}
-
-void TLuaEngine::AddResultToCheck(const std::shared_ptr<TLuaResult>& Result) {
-    std::unique_lock Lock(mResultsToCheckMutex);
-    mResultsToCheck.push_back(Result);
-    mResultsToCheckCond.notify_one();
-}
-
-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;
-        while (!Result->Ready && !Cancelled) {
-            std::this_thread::sleep_for(std::chrono::milliseconds(10));
-            ms += 10;
-            if (Max.has_value() && std::chrono::milliseconds(ms) > Max.value()) {
-                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) {
-                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 });
-        } else if (Result->Error) {
-            if (Result->ErrorMessage != BeamMPFnNotFoundError) {
-                beammp_lua_error(Result->Function + ": " + Result->ErrorMessage);
-            }
-        }
-    }
-}
-
-// run this on the error checking thread
-void TLuaEngine::ReportErrors(const std::vector<std::shared_ptr<TLuaResult>>& Results) {
-    std::unique_lock Lock2(mResultsToCheckMutex);
-    for (const auto& Result : Results) {
-        mResultsToCheck.push_back(Result);
-        mResultsToCheckCond.notify_one();
-    }
-}
-
-bool TLuaEngine::HasState(TLuaStateId StateId) {
-    std::unique_lock Lock(mLuaStatesMutex);
-    return mLuaStates.find(StateId) != mLuaStates.end();
-}
-
-std::shared_ptr<TLuaResult> TLuaEngine::EnqueueScript(TLuaStateId StateID, const TLuaChunk& Script) {
-    std::unique_lock Lock(mLuaStatesMutex);
-    return mLuaStates.at(StateID)->EnqueueScript(Script);
-}
-
-std::shared_ptr<TLuaResult> TLuaEngine::EnqueueFunctionCall(TLuaStateId StateID, const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args) {
-    std::unique_lock Lock(mLuaStatesMutex);
-    return mLuaStates.at(StateID)->EnqueueFunctionCall(FunctionName, Args);
-}
-
-void TLuaEngine::CollectAndInitPlugins() {
-    for (const auto& Dir : fs::directory_iterator(mResourceServerPath)) {
-        auto Path = Dir.path();
-        Path = fs::relative(Path);
-        if (!Dir.is_directory()) {
-            beammp_error("\"" + Dir.path().string() + "\" is not a directory, skipping");
-        } else {
-            TLuaPluginConfig Config { Path.stem().string() };
-            FindAndParseConfig(Path, Config);
-            InitializePlugin(Path, Config);
-        }
-    }
-}
-
-void TLuaEngine::InitializePlugin(const fs::path& Folder, const TLuaPluginConfig& Config) {
-    beammp_assert(fs::exists(Folder));
-    beammp_assert(fs::is_directory(Folder));
-    std::unique_lock Lock(mLuaStatesMutex);
-    EnsureStateExists(Config.StateId, Folder.stem().string(), true);
-    mLuaStates[Config.StateId]->AddPath(Folder); // add to cpath + path
-    Lock.unlock();
-    auto Plugin = std::make_shared<TLuaPlugin>(*this, Config, Folder);
-    mLuaPlugins.emplace_back(std::move(Plugin));
-}
-
-void TLuaEngine::FindAndParseConfig(const fs::path& Folder, TLuaPluginConfig& Config) {
-    auto ConfigFile = Folder / TLuaPluginConfig::FileName;
-    if (fs::exists(ConfigFile) && fs::is_regular_file(ConfigFile)) {
-        try {
-            auto Data = toml::parse(ConfigFile);
-            if (Data.contains("LuaStateID")) {
-                auto ID = toml::find<std::string>(Data, "LuaStateID");
-                if (!ID.empty()) {
-                    beammp_debug("Plugin \"" + Folder.string() + "\" specified it wants LuaStateID \"" + ID + "\"");
-                    Config.StateId = ID;
-                } else {
-                    beammp_debug("LuaStateID empty, using plugin name");
-                }
-            }
-        } catch (const std::exception& e) {
-            beammp_error(Folder.string() + ": " + e.what());
-        }
-    }
-}
-
-void TLuaEngine::EnsureStateExists(TLuaStateId StateId, const std::string& Name, bool DontCallOnInit) {
-    beammp_assert(!StateId.empty());
-    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, mShutdown, StateId, *this);
-        mLuaStates[StateId] = std::move(DataPtr);
-        RegisterEvent("onInit", StateId, "onInit");
-        if (!DontCallOnInit) {
-            auto Res = EnqueueFunctionCall(StateId, "onInit", {});
-            Res->WaitUntilReady();
-            if (Res->Error && Res->ErrorMessage != TLuaEngine::BeamMPFnNotFoundError) {
-                beammp_lua_error("Calling \"onInit\" on \"" + StateId + "\" failed: " + Res->ErrorMessage);
-            }
-        }
-    }
-}
-
-void TLuaEngine::RegisterEvent(const std::string& EventName, TLuaStateId StateId, const std::string& FunctionName) {
-    std::unique_lock Lock(mLuaEventsMutex);
-    mLuaEvents[EventName][StateId].insert(FunctionName);
-}
-
-std::set<std::string> TLuaEngine::GetEventHandlersForState(const std::string& EventName, TLuaStateId StateId) {
-    return mLuaEvents[EventName][StateId];
-}
-
-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;
-            } else {
-                Result->Error = true;
-                Result->ErrorMessage = "Function result in TriggerGlobalEvent was invalid";
-            }
-            Return.push_back(Result);
-        }
-    }
-    sol::state_view StateView(mState);
-    sol::table AsyncEventReturn = StateView.create_table();
-    AsyncEventReturn["ReturnValueImpl"] = Return;
-    AsyncEventReturn.set_function("IsDone",
-        [&](const sol::table& Self) -> bool {
-            auto Vector = Self.get<std::vector<std::shared_ptr<TLuaResult>>>("ReturnValueImpl");
-            for (const auto& Value : Vector) {
-                if (!Value->Ready) {
-                    return false;
-                }
-            }
-            return true;
-        });
-    AsyncEventReturn.set_function("GetResults",
-        [&](const sol::table& Self) -> sol::table {
-            sol::state_view StateView(mState);
-            sol::table Result = StateView.create_table();
-            auto Vector = Self.get<std::vector<std::shared_ptr<TLuaResult>>>("ReturnValueImpl");
-            for (const auto& Value : Vector) {
-                if (!Value->Ready) {
-                    return sol::lua_nil;
-                }
-                Result.add(Value->Result);
-            }
-            return Result;
-        });
-    return AsyncEventReturn;
-}
-
-sol::table TLuaEngine::StateThreadData::Lua_TriggerLocalEvent(const std::string& EventName, sol::variadic_args EventArgs) {
-    // TODO: make asynchronous?
-    sol::table Result = mStateView.create_table();
-    for (const auto& Handler : mEngine->GetEventHandlersForState(EventName, mStateId)) {
-        auto Fn = mStateView[Handler];
-        if (Fn.valid() && Fn.get_type() == sol::type::function) {
-            auto FnRet = Fn(EventArgs);
-            if (FnRet.valid()) {
-                Result.add(FnRet);
-            } else {
-                sol::error Err = FnRet;
-                beammp_lua_error(Err.what());
-            }
-        }
-    }
-    return Result;
-}
-
-sol::table TLuaEngine::StateThreadData::Lua_GetPlayerIdentifiers(int ID) {
-    auto MaybeClient = GetClient(mEngine->Server(), ID);
-    if (MaybeClient && !MaybeClient.value().expired()) {
-        auto IDs = MaybeClient.value().lock()->GetIdentifiers();
-        if (IDs.empty()) {
-            return sol::lua_nil;
-        }
-        sol::table Result = mStateView.create_table();
-        for (const auto& Pair : IDs) {
-            Result[Pair.first] = Pair.second;
-        }
-        return Result;
-    } else {
-        return sol::lua_nil;
-    }
-}
-
-sol::table TLuaEngine::StateThreadData::Lua_GetPlayers() {
-    sol::table Result = mStateView.create_table();
-    mEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
-        if (!Client.expired()) {
-            auto locked = Client.lock();
-            Result[locked->GetID()] = locked->GetName();
-        }
-        return true;
-    });
-    return Result;
-}
-
-int TLuaEngine::StateThreadData::Lua_GetPlayerIDByName(const std::string& Name) {
-    int Id = -1;
-    mEngine->mServer->ForEachClient([&Id, &Name](std::weak_ptr<TClient> Client) -> bool {
-        if (!Client.expired()) {
-            auto locked = Client.lock();
-            if (locked->GetName() == Name) {
-                Id = locked->GetID();
-                return false;
-            }
-        }
-        return true;
-    });
-    return Id;
-}
-
-std::string TLuaEngine::StateThreadData::Lua_GetPlayerName(int ID) {
-    auto MaybeClient = GetClient(mEngine->Server(), ID);
-    if (MaybeClient && !MaybeClient.value().expired()) {
-        return MaybeClient.value().lock()->GetName();
-    } else {
-        return "";
-    }
-}
-
-sol::table TLuaEngine::StateThreadData::Lua_GetPlayerVehicles(int ID) {
-    auto MaybeClient = GetClient(mEngine->Server(), ID);
-    if (MaybeClient && !MaybeClient.value().expired()) {
-        auto Client = MaybeClient.value().lock();
-        TClient::TSetOfVehicleData VehicleData;
-        { // Vehicle Data Lock Scope
-            auto LockedData = Client->GetAllCars();
-            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::table TLuaEngine::StateThreadData::Lua_HttpCreateConnection(const std::string& host, uint16_t port) {
-    auto table = mStateView.create_table();
-    constexpr const char* InternalClient = "__InternalClient";
-    table["host"] = host;
-    table["port"] = port;
-    auto client = std::make_shared<httplib::Client>(host, port);
-    table[InternalClient] = client;
-    table.set_function("Get", [&InternalClient](const sol::table& table, const std::string& path, const sol::table& headers) {
-        httplib::Headers GetHeaders;
-        for (const auto& pair : headers) {
-            if (pair.first.is<std::string>() && pair.second.is<std::string>()) {
-                GetHeaders.insert(std::pair(pair.first.as<std::string>(), pair.second.as<std::string>()));
-            } else {
-                beammp_lua_error("Http:Get: Expected string-string pairs for headers, got something else, ignoring that header");
-            }
-        }
-        auto client = table[InternalClient].get<std::shared_ptr<httplib::Client>>();
-        client->Get(path.c_str(), GetHeaders);
-    });
-    return table;
-}
-
-TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, std::atomic_bool& Shutdown, TLuaStateId StateId, TLuaEngine& Engine)
-    : mName(Name)
-    , mShutdown(Shutdown)
-    , mStateId(StateId)
-    , mState(luaL_newstate())
-    , mEngine(&Engine) {
-    if (!mState) {
-        beammp_error("failed to create lua state for \"" + StateId + "\"");
-        return;
-    }
-    luaL_openlibs(mState);
-    sol::state_view StateView(mState);
-    lua_atpanic(mState, LuaAPI::PanicHandler);
-    // StateView.globals()["package"].get()
-    StateView.set_function("print", &LuaAPI::Print);
-    StateView.set_function("printRaw", &LuaAPI::MP::PrintRaw);
-    StateView.set_function("exit", &Application::GracefullyShutdown);
-
-    auto MPTable = StateView.create_named_table("MP");
-    MPTable.set_function("CreateTimer", [&]() -> sol::table {
-        sol::state_view StateView(mState);
-        sol::table Result = StateView.create_table();
-        Result["__StartTime"] = std::chrono::high_resolution_clock::now();
-        Result.set_function("GetCurrent", [&](const sol::table& Table) -> float {
-            auto End = std::chrono::high_resolution_clock::now();
-            auto Start = Table.get<std::chrono::high_resolution_clock::time_point>("__StartTime");
-            return std::chrono::duration_cast<std::chrono::microseconds>(End - Start).count() / 1000000.0f;
-        });
-        Result.set_function("Start", [&](sol::table Table) {
-            Table["__StartTime"] = std::chrono::high_resolution_clock::now();
-        });
-        return Result;
-    });
-    MPTable.set_function("GetOSName", &LuaAPI::MP::GetOSName);
-    MPTable.set_function("GetServerVersion", &LuaAPI::MP::GetServerVersion);
-    MPTable.set_function("RegisterEvent", [this](const std::string& EventName, const std::string& FunctionName) {
-        RegisterEvent(EventName, FunctionName);
-    });
-    MPTable.set_function("TriggerGlobalEvent", [&](const std::string& EventName, sol::variadic_args EventArgs) -> sol::table {
-        return Lua_TriggerGlobalEvent(EventName, EventArgs);
-    });
-    MPTable.set_function("TriggerLocalEvent", [&](const std::string& EventName, sol::variadic_args EventArgs) -> sol::table {
-        return Lua_TriggerLocalEvent(EventName, EventArgs);
-    });
-    MPTable.set_function("TriggerClientEvent", &LuaAPI::MP::TriggerClientEvent);
-    MPTable.set_function("GetPlayerCount", &LuaAPI::MP::GetPlayerCount);
-    MPTable.set_function("IsPlayerConnected", &LuaAPI::MP::IsPlayerConnected);
-    MPTable.set_function("GetPlayerIDByName", [&](const std::string& Name) -> int {
-        return Lua_GetPlayerIDByName(Name);
-    });
-    MPTable.set_function("GetPlayerName", [&](int ID) -> std::string {
-        return Lua_GetPlayerName(ID);
-    });
-    MPTable.set_function("RemoveVehicle", &LuaAPI::MP::RemoveVehicle);
-    MPTable.set_function("GetPlayerVehicles", [&](int ID) -> sol::table {
-        return Lua_GetPlayerVehicles(ID);
-    });
-    MPTable.set_function("SendChatMessage", &LuaAPI::MP::SendChatMessage);
-    MPTable.set_function("GetPlayers", [&]() -> sol::table {
-        return Lua_GetPlayers();
-    });
-    MPTable.set_function("IsPlayerGuest", &LuaAPI::MP::IsPlayerGuest);
-    MPTable.set_function("DropPlayer", &LuaAPI::MP::DropPlayer);
-    MPTable.set_function("GetStateMemoryUsage", [&]() -> size_t {
-        return mStateView.memory_used();
-    });
-    MPTable.set_function("GetLuaMemoryUsage", [&]() -> size_t {
-        return mEngine->CalculateMemoryUsage();
-    });
-    MPTable.set_function("GetPlayerIdentifiers", [&](int ID) -> sol::table {
-        return Lua_GetPlayerIdentifiers(ID);
-    });
-    MPTable.set_function("Sleep", &LuaAPI::MP::Sleep);
-    //  const std::string& EventName, size_t IntervalMS, int strategy
-    MPTable.set_function("CreateEventTimer", [&](sol::variadic_args Args) {
-        if (Args.size() < 2 || Args.size() > 3) {
-            beammp_lua_error("CreateEventTimer expects 2 or 3 arguments.");
-        }
-        if (Args.get_type(0) != sol::type::string) {
-            beammp_lua_error("CreateEventTimer expects 1st argument to be a string");
-        }
-        if (Args.get_type(1) != sol::type::number) {
-            beammp_lua_error("CreateEventTimer expects 2nd argument to be a number");
-        }
-        if (Args.size() == 3 && Args.get_type(2) != sol::type::number) {
-            beammp_lua_error("CreateEventTimer expects 3rd argument to be a number (MP.CallStrategy)");
-        }
-        auto EventName = Args.get<std::string>(0);
-        auto IntervalMS = Args.get<size_t>(1);
-        CallStrategy Strategy = Args.size() > 2 ? Args.get<CallStrategy>(2) : CallStrategy::BestEffort;
-        if (IntervalMS < 25) {
-            beammp_warn("Timer for \"" + EventName + "\" on \"" + mStateId + "\" is set to trigger at <25ms, which is likely too fast and won't cancel properly.");
-        }
-        mEngine->CreateEventTimer(EventName, mStateId, IntervalMS, Strategy);
-    });
-    MPTable.set_function("CancelEventTimer", [&](const std::string& EventName) {
-        mEngine->CancelEventTimers(EventName, mStateId);
-    });
-    MPTable.set_function("Set", &LuaAPI::MP::Set);
-    auto HttpTable = StateView.create_named_table("Http");
-    HttpTable.set_function("CreateConnection", [this](const std::string& host, uint16_t port) {
-        return Lua_HttpCreateConnection(host, port);
-    });
-
-    MPTable.create_named("Settings",
-        "Debug", 0,
-        "Private", 1,
-        "MaxCars", 2,
-        "MaxPlayers", 3,
-        "Map", 4,
-        "Name", 5,
-        "Description", 6);
-
-    MPTable.create_named("CallStrategy",
-        "BestEffort", CallStrategy::BestEffort,
-        "Precise", CallStrategy::Precise);
-
-    auto FSTable = StateView.create_named_table("FS");
-    FSTable.set_function("CreateDirectory", &LuaAPI::FS::CreateDirectory);
-    FSTable.set_function("Exists", &LuaAPI::FS::Exists);
-    FSTable.set_function("Remove", &LuaAPI::FS::Remove);
-    FSTable.set_function("Rename", &LuaAPI::FS::Rename);
-    FSTable.set_function("Copy", &LuaAPI::FS::Copy);
-    FSTable.set_function("GetFilename", &LuaAPI::FS::GetFilename);
-    FSTable.set_function("GetExtension", &LuaAPI::FS::GetExtension);
-    FSTable.set_function("GetParentFolder", &LuaAPI::FS::GetParentFolder);
-    FSTable.set_function("IsDirectory", &LuaAPI::FS::IsDirectory);
-    FSTable.set_function("IsFile", &LuaAPI::FS::IsFile);
-    FSTable.set_function("ConcatPaths", &LuaAPI::FS::ConcatPaths);
-    Start();
-}
-
-std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueScript(const TLuaChunk& Script) {
-    std::unique_lock Lock(mStateExecuteQueueMutex);
-    auto Result = std::make_shared<TLuaResult>();
-    mStateExecuteQueue.push({ Script, Result });
-    return Result;
-}
-
-std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueFunctionCallFromCustomEvent(const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args, const std::string& EventName, CallStrategy Strategy) {
-    // TODO: Document all this
-    decltype(mStateFunctionQueue)::iterator Iter = mStateFunctionQueue.end();
-    if (Strategy == CallStrategy::BestEffort) {
-        Iter = std::find_if(mStateFunctionQueue.begin(), mStateFunctionQueue.end(),
-            [&EventName](const QueuedFunction& Element) {
-                return Element.EventName == EventName;
-            });
-    }
-    if (Iter == mStateFunctionQueue.end()) {
-        auto Result = std::make_shared<TLuaResult>();
-        Result->StateId = mStateId;
-        Result->Function = FunctionName;
-        std::unique_lock Lock(mStateFunctionQueueMutex);
-        mStateFunctionQueue.push_back({ FunctionName, Result, Args, EventName });
-        mStateFunctionQueueCond.notify_all();
-        return Result;
-    } else {
-        return nullptr;
-    }
-}
-
-std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueFunctionCall(const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args) {
-    auto Result = std::make_shared<TLuaResult>();
-    Result->StateId = mStateId;
-    Result->Function = FunctionName;
-    std::unique_lock Lock(mStateFunctionQueueMutex);
-    mStateFunctionQueue.push_back({ FunctionName, Result, Args, "" });
-    mStateFunctionQueueCond.notify_all();
-    return Result;
-}
-
-void TLuaEngine::StateThreadData::RegisterEvent(const std::string& EventName, const std::string& FunctionName) {
-    mEngine->RegisterEvent(EventName, mStateId, FunctionName);
-}
-
-void TLuaEngine::StateThreadData::operator()() {
-    RegisterThread("Lua:" + mStateId);
-    while (!mShutdown) {
-        { // StateExecuteQueue Scope
-            std::unique_lock Lock(mStateExecuteQueueMutex);
-            if (!mStateExecuteQueue.empty()) {
-                auto S = mStateExecuteQueue.front();
-                mStateExecuteQueue.pop();
-                Lock.unlock();
-
-                { // Paths Scope
-                    std::unique_lock Lock(mPathsMutex);
-                    if (!mPaths.empty()) {
-                        std::stringstream PathAdditions;
-                        std::stringstream CPathAdditions;
-                        while (!mPaths.empty()) {
-                            auto Path = mPaths.front();
-                            mPaths.pop();
-                            PathAdditions << ";" << (Path / "?.lua").string();
-                            PathAdditions << ";" << (Path / "lua/?.lua").string();
-#if WIN32
-                            CPathAdditions << ";" << (Path / "?.dll").string();
-                            CPathAdditions << ";" << (Path / "lib/?.dll").string();
-#else // unix
-                            CPathAdditions << ";" << (Path / "?.so").string();
-                            CPathAdditions << ";" << (Path / "lib/?.so").string();
-#endif
-                        }
-                        sol::state_view StateView(mState);
-                        auto PackageTable = StateView.globals().get<sol::table>("package");
-                        PackageTable["path"] = PackageTable.get<std::string>("path") + PathAdditions.str();
-                        PackageTable["cpath"] = PackageTable.get<std::string>("cpath") + CPathAdditions.str();
-                        StateView.globals()["package"] = PackageTable;
-                    }
-                }
-                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);
-                } else {
-                    S.second->Error = true;
-                    sol::error Err = Res;
-                    S.second->ErrorMessage = Err.what();
-                }
-            }
-        }
-        { // StateFunctionQueue Scope
-            std::unique_lock Lock(mStateFunctionQueueMutex);
-            auto NotExpired = mStateFunctionQueueCond.wait_for(Lock,
-                std::chrono::milliseconds(500),
-                [&]() -> bool { return !mStateFunctionQueue.empty(); });
-            if (NotExpired) {
-                auto TheQueuedFunction = std::move(mStateFunctionQueue.front());
-                mStateFunctionQueue.erase(mStateFunctionQueue.begin());
-                Lock.unlock();
-                auto& FnName = TheQueuedFunction.FunctionName;
-                auto& Result = TheQueuedFunction.Result;
-                auto Args = TheQueuedFunction.Args;
-                // TODO: Use TheQueuedFunction.EventName for errors, warnings, etc
-                Result->StateId = mStateId;
-                sol::state_view StateView(mState);
-                auto Fn = StateView[FnName];
-                if (Fn.valid() && Fn.get_type() == sol::type::function) {
-                    std::vector<sol::object> LuaArgs;
-                    for (const auto& Arg : Args) {
-                        if (Arg.valueless_by_exception()) {
-                            continue;
-                        }
-                        switch (Arg.index()) {
-                        case TLuaArgTypes_String:
-                            LuaArgs.push_back(sol::make_object(StateView, std::get<std::string>(Arg)));
-                            break;
-                        case TLuaArgTypes_Int:
-                            LuaArgs.push_back(sol::make_object(StateView, std::get<int>(Arg)));
-                            break;
-                        case TLuaArgTypes_VariadicArgs:
-                            LuaArgs.push_back(sol::make_object(StateView, std::get<sol::variadic_args>(Arg)));
-                            break;
-                        case TLuaArgTypes_Bool:
-                            LuaArgs.push_back(sol::make_object(StateView, std::get<bool>(Arg)));
-                            break;
-                        default:
-                            beammp_error("Unknown argument type, passed as nil");
-                            break;
-                        }
-                    }
-                    auto Res = Fn(sol::as_args(LuaArgs));
-                    if (Res.valid()) {
-                        Result->Error = false;
-                        Result->Result = std::move(Res);
-                    } else {
-                        Result->Error = true;
-                        sol::error Err = Res;
-                        Result->ErrorMessage = Err.what();
-                    }
-                    Result->Ready = true;
-                } else {
-                    Result->Error = true;
-                    Result->ErrorMessage = BeamMPFnNotFoundError; // special error kind that we can ignore later
-                    Result->Ready = true;
-                }
-            }
-        }
-    }
-}
-
-void TLuaEngine::CreateEventTimer(const std::string& EventName, TLuaStateId StateId, size_t IntervalMS, CallStrategy Strategy) {
-    std::unique_lock Lock(mTimedEventsMutex);
-    TimedEvent Event {
-        std::chrono::high_resolution_clock::duration { std::chrono::milliseconds(IntervalMS) },
-        std::chrono::high_resolution_clock::now(),
-        EventName,
-        StateId,
-        Strategy
-    };
-    mTimedEvents.push_back(std::move(Event));
-    beammp_trace("created event timer for \"" + EventName + "\" on \"" + StateId + "\" with " + std::to_string(IntervalMS) + "ms interval");
-}
-
-void TLuaEngine::CancelEventTimers(const std::string& EventName, TLuaStateId StateId) {
-    std::unique_lock Lock(mTimedEventsMutex);
-    beammp_trace("cancelling event timer for \"" + EventName + "\" on \"" + StateId + "\"");
-    for (;;) {
-        auto Iter = std::find_if(mTimedEvents.begin(), mTimedEvents.end(), [&](const TimedEvent& Event) -> bool {
-            return Event.EventName == EventName && Event.StateId == StateId;
-        });
-        if (Iter != mTimedEvents.end()) {
-            mTimedEvents.erase(Iter);
-        } else {
-            break;
-        }
-    }
-}
-
-void TLuaEngine::StateThreadData::AddPath(const fs::path& Path) {
-    std::unique_lock Lock(mPathsMutex);
-    mPaths.push(Path);
-}
-
-void TLuaResult::WaitUntilReady() {
-    while (!Ready) {
-        std::this_thread::yield();
-        std::this_thread::sleep_for(std::chrono::milliseconds(10));
-    }
-}
-
-TLuaChunk::TLuaChunk(std::shared_ptr<std::string> Content, std::string FileName, std::string PluginPath)
-    : Content(Content)
-    , FileName(FileName)
-    , PluginPath(PluginPath) {
-}
-
-bool TLuaEngine::TimedEvent::Expired() {
-    auto Waited = (std::chrono::high_resolution_clock::now() - LastCompletion);
-    return Waited >= Duration;
-}
-
-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);
-                        }
-                    }*/
-                }
-            }
-        }
-    }
-}
@@ -1,52 +0,0 @@
-#include "TLuaPlugin.h"
-#include <chrono>
-#include <functional>
-#include <random>
-#include <utility>
-
-TLuaPlugin::TLuaPlugin(TLuaEngine& Engine, const TLuaPluginConfig& Config, const fs::path& MainFolder)
-    : mConfig(Config)
-    , mEngine(Engine)
-    , mFolder(MainFolder)
-    , mPluginName(MainFolder.stem().string())
-    , mFileContents(0) {
-    beammp_debug("Lua plugin \"" + mPluginName + "\" starting in \"" + mFolder.string() + "\"");
-    std::vector<fs::path> Entries;
-    for (const auto& Entry : fs::directory_iterator(mFolder)) {
-        if (Entry.is_regular_file() && Entry.path().extension() == ".lua") {
-            Entries.push_back(Entry);
-        }
-    }
-    // sort alphabetically (not needed if config is used to determine call order)
-    // TODO: Use config to figure out what to run in which order
-    std::sort(Entries.begin(), Entries.end(), [](const fs::path& first, const fs::path& second) {
-        auto firstStr = first.string();
-        auto secondStr = second.string();
-        std::transform(firstStr.begin(), firstStr.end(), firstStr.begin(), ::tolower);
-        std::transform(secondStr.begin(), secondStr.end(), secondStr.begin(), ::tolower);
-        return firstStr < secondStr;
-    });
-    std::vector<std::pair<fs::path, std::shared_ptr<TLuaResult>>> ResultsToCheck;
-    for (const auto& Entry : Entries) {
-        // read in entire file
-        try {
-            std::ifstream FileStream(Entry.string(), std::ios::in | std::ios::binary);
-            auto Size = std::filesystem::file_size(Entry);
-            auto Contents = std::make_shared<std::string>();
-            Contents->resize(Size);
-            FileStream.read(Contents->data(), Contents->size());
-            mFileContents[fs::relative(Entry).string()] = Contents;
-            // Execute first time
-            auto Result = mEngine.EnqueueScript(mConfig.StateId, TLuaChunk(Contents, Entry.string(), MainFolder.string()));
-            ResultsToCheck.emplace_back(Entry.string(), std::move(Result));
-        } catch (const std::exception& e) {
-            beammp_error("Error loading file \"" + Entry.string() + "\": " + e.what());
-        }
-    }
-    for (auto& Result : ResultsToCheck) {
-        Result.second->WaitUntilReady();
-        if (Result.second->Error) {
-            beammp_lua_error("Failed: \"" + Result.first.string() + "\": " + Result.second->ErrorMessage);
-        }
-    }
-}
@@ -1,982 +0,0 @@
-#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);
-}
@@ -1,70 +0,0 @@
-#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;
-    }
-}
@@ -1,35 +0,0 @@
-#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);
-}
@@ -1,27 +0,0 @@
-#include "TScopedTimer.h"
-#include "Common.h"
-
-TScopedTimer::TScopedTimer()
-    : mStartTime(std::chrono::high_resolution_clock::now()) {
-}
-
-TScopedTimer::TScopedTimer(const std::string& mName)
-    : mStartTime(std::chrono::high_resolution_clock::now())
-    , Name(mName) {
-}
-
-TScopedTimer::TScopedTimer(std::function<void(size_t)> OnDestroy)
-    : OnDestroy(OnDestroy)
-    , mStartTime(std::chrono::high_resolution_clock::now()) {
-}
-
-TScopedTimer::~TScopedTimer() {
-    auto EndTime = std::chrono::high_resolution_clock::now();
-    auto Delta = EndTime - mStartTime;
-    size_t TimeDelta = Delta / std::chrono::milliseconds(1);
-    if (OnDestroy) {
-        OnDestroy(TimeDelta);
-    } else {
-        beammp_info("Scoped timer: \"" + Name + "\" took " + std::to_string(TimeDelta) + "ms ");
-    }
-}
@@ -1,138 +0,0 @@
-#include "TSentry.h"
-#include "Common.h"
-
-#include <cstring>
-#include <sentry.h>
-#include <sstream>
-
-TSentry::TSentry() {
-    if (std::strlen(S_DSN) == 0) {
-        mValid = false;
-    } else {
-        mValid = true;
-        sentry_options_t* options = sentry_options_new();
-        sentry_options_set_dsn(options, S_DSN);
-        auto ReleaseString = "BeamMP-Server@" + Application::ServerVersionString();
-        sentry_options_set_symbolize_stacktraces(options, true);
-        sentry_options_set_release(options, ReleaseString.c_str());
-        sentry_options_set_max_breadcrumbs(options, 10);
-        sentry_init(options);
-    }
-}
-
-TSentry::~TSentry() {
-    if (mValid) {
-        sentry_close();
-    }
-}
-
-void TSentry::PrintWelcome() {
-    if (mValid) {
-        if (!Application::Settings.SendErrors) {
-            mValid = false;
-            if (Application::Settings.SendErrorsMessageEnabled) {
-                beammp_info("Opted out of error reporting (SendErrors), Sentry disabled.");
-            } else {
-                beammp_info("Sentry disabled");
-            }
-        } else {
-            if (Application::Settings.SendErrorsMessageEnabled) {
-                beammp_info("Sentry started! Reporting errors automatically. This sends data to the developers in case of errors and crashes. You can learn more, turn this message off or opt-out of this in the ServerConfig.toml.");
-            } else {
-                beammp_info("Sentry started");
-            }
-        }
-    } else {
-        if (Application::Settings.SendErrorsMessageEnabled) {
-            beammp_info("Sentry disabled in unofficial build. Automatic error reporting disabled.");
-        } else {
-            beammp_info("Sentry disabled in unofficial build");
-        }
-    }
-}
-
-void TSentry::SetupUser() {
-    if (!mValid) {
-        return;
-    }
-    Application::SetSubsystemStatus("Sentry", Application::Status::Good);
-    sentry_value_t user = sentry_value_new_object();
-    if (Application::Settings.Key.size() == 36) {
-        sentry_value_set_by_key(user, "id", sentry_value_new_string(Application::Settings.Key.c_str()));
-    } else {
-        sentry_value_set_by_key(user, "id", sentry_value_new_string("unauthenticated"));
-    }
-    sentry_set_user(user);
-}
-
-void TSentry::Log(SentryLevel level, const std::string& logger, const std::string& text) {
-    if (!mValid) {
-        return;
-    }
-    SetContext("threads", { { "thread-name", ThreadName(true) } });
-    auto Msg = sentry_value_new_message_event(sentry_level_t(level), logger.c_str(), text.c_str());
-    sentry_capture_event(Msg);
-    sentry_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);
-}
@@ -1,375 +0,0 @@
-#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);
-}
@@ -1,14 +0,0 @@
-#include "VehicleData.h"
-
-#include "Common.h"
-#include <utility>
-
-TVehicleData::TVehicleData(int ID, std::string Data)
-    : mID(ID)
-    , mData(std::move(Data)) {
-    beammp_trace("vehicle " + std::to_string(mID) + " constructed");
-}
-
-TVehicleData::~TVehicleData() {
-    beammp_trace("vehicle " + std::to_string(mID) + " destroyed");
-}
@@ -0,0 +1,76 @@
+use std::path::{Path, PathBuf};
+use serde::Deserialize;
+use uuid::Uuid;
+use crate::fs_util;
+
+#[derive(Deserialize)]
+pub struct Config {
+    #[serde(skip)] // Skipping uses Default::default, which makes a new vector for us :)
+    pub mods: Vec<(String, usize)>,
+
+    #[serde(rename = "General")]
+    pub general: GeneralSettings,
+}
+
+#[derive(Deserialize)]
+pub struct GeneralSettings {
+    #[serde(rename = "Port")]
+    pub port: Option<u16>,
+
+    #[serde(rename = "Name")]
+    pub name: String,
+
+    #[serde(rename = "Description")]
+    pub description: String,
+
+    #[serde(rename = "AuthKey")]
+    pub auth_key: Option<String>,
+
+    #[serde(rename = "MaxCars")]
+    pub max_cars: Option<u8>,
+
+    #[serde(rename = "MaxPlayers")]
+    pub max_players: usize,
+
+    #[serde(rename = "Private")]
+    pub private: bool,
+
+    #[serde(rename = "Map")]
+    pub map: String,
+
+    #[serde(rename = "ResourceFolder")]
+    pub resource_folder: String,
+
+    #[serde(rename = "Debug")]
+    pub debug: bool,
+
+    // Options below are not yet supported
+    #[serde(rename = "LogChat")]
+    pub log_chat: bool,
+}
+
+impl GeneralSettings {
+    pub fn is_auth_key_valid(&self) -> bool {
+        if let Some(auth_key) = &self.auth_key {
+            Uuid::parse_str(auth_key.as_str()).is_ok()
+        } else {
+            false
+        }
+    }
+
+    /// Returns the client resource path, and ensures it exists.
+    /// Default is Resources/Client.
+    pub fn get_client_resource_folder(&self) -> anyhow::Result<String> {
+        let res_client_path = Path::new(self.resource_folder.as_str()).join("Client");
+        fs_util::ensure_path_exists(&res_client_path)?;
+        Ok(fs_util::path_to_string(res_client_path))
+    }
+
+    /// Returns the server resource path, and ensures it exists.
+    /// Default is Resources/Server.
+    pub fn get_server_resource_folder(&self) -> anyhow::Result<String> {
+        let res_server_path = Path::new(self.resource_folder.as_str()).join("Server");
+        fs_util::ensure_path_exists(&res_server_path)?;
+        Ok(fs_util::path_to_string(res_server_path))
+    }
+}
@@ -0,0 +1,22 @@
+use std::path::{Path, PathBuf};
+
+/// Ensures the given path exists by creating it if it doesn't.
+pub fn ensure_path_exists(path: &PathBuf) -> anyhow::Result<()> {
+    if !path.exists() {
+        debug!("Path {:?} doesn't exist, creating it", path);
+        std::fs::create_dir_all(path)?;
+    }
+    Ok(())
+}
+
+/// Joins a parent folder and a sub-path, resolving the subpath beforehand to ensure that
+/// the resulting path is still within the parent folder, regardless of ".." in the sub-path.
+pub fn join_path_secure(parent: &Path, sub: &Path) -> anyhow::Result<PathBuf> {
+    Ok(parent.join(sub.file_name().unwrap_or("".as_ref())))
+}
+
+/// Converts a PathBuf into a String in a lossy way. This is generally the way we want to do it
+/// in the server.
+pub fn path_to_string(path: PathBuf) -> String {
+    path.into_os_string().to_string_lossy().to_string()
+}
@@ -0,0 +1,80 @@
+use serde::Serialize;
+use tokio::sync::mpsc::Receiver;
+
+#[derive(Serialize)]
+struct HeartbeatInfo {
+    uuid: String,
+    players: usize,
+    maxplayers: usize,
+    port: u16,
+    map: String,
+    private: String, // Needs to be either "true" or "false"
+    version: String,
+    clientversion: String,
+    name: String,
+    modlist: String,
+    modstotalsize: usize,
+    modstotal: usize,
+    playerslist: String,
+    desc: String,
+}
+
+pub async fn backend_heartbeat(config: std::sync::Arc<crate::config::Config>, mut hb_rx: Receiver<crate::server::ServerStatus>) {
+    if !config.general.is_auth_key_valid() {
+        if config.general.private {
+            warn!("AuthKey has invalid format. This is not an error, since your server is private.");
+        } else {
+            error!("AuthKey has invalid format. The server will not appear on the server list.");
+        }
+        // FIXME: The heartbeat should be started if the config is ever changed/reloaded.
+        return;
+    }
+    let mut info = HeartbeatInfo {
+        uuid: config.general.auth_key.clone().unwrap_or(String::from("Unknown name!")),
+        players: 0,
+        maxplayers: config.general.max_players,
+        port: config.general.port.unwrap_or(30814),
+        map: config.general.map.clone(),
+        private: if config.general.private { String::from("true") } else { String::from("false") },
+        version: String::from("3.3.0"), // TODO: Don't hardcode this
+        clientversion: String::from("2.0"), // TODO: What? I think for now I can fill in 2.0
+        name: config.general.name.clone(),
+        modlist: String::from("-"), // TODO: Implement this
+        modstotalsize: 0, // TODO: Implement this
+        modstotal: 0, // TODO: Implement this
+        playerslist: String::new(),
+        desc: config.general.description.clone(),
+    };
+
+    let mut interval = tokio::time::interval(tokio::time::Duration::from_secs(30));
+    loop {
+        interval.tick().await;
+
+        tokio::select! {
+            _ = heartbeat_post(&info) => {}
+            status = hb_rx.recv() => {
+                if let Some(status) = status {
+                    trace!("status update: {:?}", status);
+                    info.players = status.player_count;
+                    info.playerslist = status.player_list.iter().map(|(_id, name)| format!("{};", name)).collect();
+                }
+            }
+        }
+    }
+}
+
+async fn heartbeat_post(heartbeat_info: &HeartbeatInfo) {
+    match reqwest::Client::builder()
+        .local_address("0.0.0.0".parse::<std::net::IpAddr>().unwrap())
+        .build().unwrap()
+        .post("https://backend.beammp.com/heartbeat")
+        .form(heartbeat_info)
+        .send()
+        .await
+    {
+        Ok(resp) => {
+            trace!("heartbeat response:\n{:?}", resp.text().await);
+        },
+        Err(e) => error!("Heartbeat error occured: {e}"),
+    }
+}
@@ -0,0 +1,44 @@
+use log::{Record, Level, Metadata, SetLoggerError, LevelFilter};
+use std::sync::Mutex;
+
+lazy_static! {
+    static ref LOG_BUFFER: Mutex<Vec<(Level, String)>> = Mutex::new(Vec::new());
+}
+
+struct BufferedLogger;
+
+impl log::Log for BufferedLogger {
+    fn enabled(&self, metadata: &Metadata) -> bool {
+        let mut enabled = true;
+        if metadata.level() != Level::Error {
+            if metadata.target().starts_with("rustls") {
+                enabled = false;
+            }
+        }
+        enabled
+    }
+
+    fn log(&self, record: &Record) {
+        if self.enabled(record.metadata()) {
+            let msg = format!("{}", record.args());
+            let mut lock = LOG_BUFFER.lock().expect("Logging lock poisoned!");
+            lock.push((record.level(), msg));
+        }
+    }
+
+    fn flush(&self) {}
+}
+
+static LOGGER: BufferedLogger = BufferedLogger;
+
+pub fn init(filter: LevelFilter) -> Result<(), SetLoggerError> {
+    log::set_logger(&LOGGER)
+        .map(|()| log::set_max_level(filter))
+}
+
+pub async fn drain_log_buffer() -> Vec<(Level, String)> {
+    let mut lock = LOG_BUFFER.lock().expect("Logging lock poisoned!");
+    let v = lock.drain(..).collect();
+    drop(lock);
+    v
+}
@@ -1,211 +0,0 @@
-#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 "TNetwork.h"
-#include "TPPSMonitor.h"
-#include "TResourceManager.h"
-#include "TScopedTimer.h"
-#include "TServer.h"
-
-#include <iostream>
-#include <thread>
-#define CPPHTTPLIB_OPENSSL_SUPPORT 1
-static const std::string sCommandlineArguments = R"(
-USAGE: 
-    BeamMP-Server [arguments]
-    
-ARGUMENTS:
-    --help              
-                        Displays this help and exits.
-    --config=/path/to/ServerConfig.toml
-                        Absolute or relative path to the 
-                        Server Config file, including the
-                        filename. For paths and filenames with 
-                        spaces, put quotes around the path.
-    --working-directory=/path/to/folder
-                        Sets the working directory of the Server.
-                        All paths are considered relative to this,
-                        including the path given in --config.
-    --version
-                        Prints version info and exits.
-
-EXAMPLES:
-    BeamMP-Server --config=../MyWestCoastServerConfig.toml
-        Runs the BeamMP-Server and uses the server config file 
-        which is one directory above it and is named
-        '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 {};
-    std::vector<std::string_view> List;
-    std::string InvokedAs;
-};
-
-int BeamMPServerMain(MainArguments Arguments);
-
-int main(int argc, char** argv) {
-    MainArguments Args { argc, argv, {}, argv[0] };
-    Args.List.reserve(argc);
-    for (int i = 1; i < argc; ++i) {
-        Args.List.push_back(argv[i]);
-    }
-    int MainRet = 0;
-    try {
-        MainRet = BeamMPServerMain(std::move(Args));
-    } 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;
-    }
-    return MainRet;
-}
-
-int BeamMPServerMain(MainArguments Arguments) {
-    setlocale(LC_ALL, "C");
-    Application::InitializeConsole();
-    ArgsParser Parser;
-    Parser.RegisterArgument({ "help" }, ArgsParser::NONE);
-    Parser.RegisterArgument({ "version" }, ArgsParser::NONE);
-    Parser.RegisterArgument({ "config" }, ArgsParser::HAS_VALUE);
-    Parser.RegisterArgument({ "working-directory" }, ArgsParser::HAS_VALUE);
-    Parser.Parse(Arguments.List);
-    if (!Parser.Verify()) {
-        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;
-    }
-
-    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 + "'");
-        }
-    }
-    if (Parser.FoundArgument({ "working-directory" })) {
-        auto MaybeWorkingDirectory = Parser.GetValueOfArgument({ "working-directory" });
-        if (MaybeWorkingDirectory.has_value()) {
-            beammp_info("Custom working directory requested via commandline arguments: '" + MaybeWorkingDirectory.value() + "'");
-            try {
-                fs::current_path(fs::path(MaybeWorkingDirectory.value()));
-            } catch (const std::exception& e) {
-                beammp_error("Could not set working directory to '" + MaybeWorkingDirectory.value() + "': " + e.what());
-            }
-        }
-    }
-
-    Application::SetSubsystemStatus("Main", Application::Status::Starting);
-
-    Application::Console().StartLoggingToFile();
-
-    SetupSignalHandlers();
-
-    bool Shutdown = false;
-    Application::RegisterShutdownHandler([&Shutdown] {
-        beammp_info("If this takes too long, you can press Ctrl+C repeatedly to force a shutdown.");
-        Application::SetSubsystemStatus("Main", Application::Status::ShuttingDown);
-        Shutdown = true;
-    });
-    Application::RegisterShutdownHandler([] {
-        auto Futures = LuaAPI::MP::Engine->TriggerEvent("onShutdown", "");
-        TLuaEngine::WaitForAll(Futures, std::chrono::seconds(5));
-    });
-
-    TServer Server(Arguments.List);
-    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");
-    Sentry.SetupUser();
-    Sentry.PrintWelcome();
-    TResourceManager ResourceManager;
-    TPPSMonitor PPSMonitor(Server);
-    THeartbeatThread Heartbeat(ResourceManager, Server);
-    TNetwork Network(Server, PPSMonitor, ResourceManager);
-    LuaEngine.SetNetwork(&Network);
-    PPSMonitor.SetNetwork(Network);
-    Application::CheckForUpdates();
-
-    if (Application::Settings.HTTPServerEnabled) {
-        Http::Server::SetupEnvironment();
-        Http::Server::THttpServerInstance HttpServerInstance {};
-    }
-
-    Application::SetSubsystemStatus("Main", Application::Status::Good);
-    RegisterThread("Main(Waiting)");
-
-    std::set<std::string> IgnoreSubsystems {
-        "UpdateCheck" // Ignore as not to confuse users (non-vital system)
-    };
-
-    bool FullyStarted = false;
-    while (!Shutdown) {
-        if (!FullyStarted) {
-            FullyStarted = true;
-            bool WithErrors = false;
-            std::string SystemsBadList {};
-            auto Statuses = Application::GetSubsystemStatuses();
-            for (const auto& NameStatusPair : Statuses) {
-                if (IgnoreSubsystems.count(NameStatusPair.first) > 0) {
-                    continue; // ignore
-                }
-                if (NameStatusPair.second == Application::Status::Starting) {
-                    FullyStarted = false;
-                } else if (NameStatusPair.second == Application::Status::Bad) {
-                    SystemsBadList += NameStatusPair.first + ", ";
-                    WithErrors = true;
-                }
-            }
-            // remove ", "
-            SystemsBadList = SystemsBadList.substr(0, SystemsBadList.size() - 2);
-            if (FullyStarted) {
-                if (!WithErrors) {
-                    beammp_info("ALL SYSTEMS STARTED SUCCESSFULLY, EVERYTHING IS OKAY");
-                } else {
-                    beammp_error("STARTUP NOT SUCCESSFUL, SYSTEMS " + SystemsBadList + " HAD ERRORS. THIS MAY OR MAY NOT CAUSE ISSUES.");
-                }
-            }
-        }
-        std::this_thread::sleep_for(std::chrono::milliseconds(100));
-    }
-    Application::SetSubsystemStatus("Main", Application::Status::Shutdown);
-    beammp_info("Shutdown.");
-    return 0;
-}
@@ -0,0 +1,165 @@
+#[macro_use] extern crate log;
+#[macro_use] extern crate async_trait;
+#[macro_use] extern crate lazy_static;
+
+use std::path::Path;
+use argh::FromArgs;
+
+use std::sync::Arc;
+use tokio::sync::mpsc;
+
+mod logger;
+mod tui;
+mod server;
+mod config;
+mod heartbeat;
+mod fs_util;
+
+#[derive(FromArgs)]
+/// BeamMP Server v3.3.0
+struct Args {
+    /// disables the TUI and shows a simple console log instead
+    #[argh(switch)]
+    disable_tui: bool,
+}
+
+#[tokio::main]
+async fn main() {
+    let args: Args = argh::from_env();
+
+    let mut user_config: config::Config = toml::from_str(
+            &std::fs::read_to_string("ServerConfig.toml")
+                .map_err(|_| error!("Failed to read config file!"))
+                .expect("Failed to read config file!")
+        )
+        .map_err(|_| eprintln!("Failed to parse config file!"))
+        .expect("Failed to parse config file!");
+
+    let level_filter = if user_config.general.debug { log::LevelFilter::max() } else { log::LevelFilter::Info };
+    if !args.disable_tui {
+        logger::init(level_filter).expect("Failed to enable logger!");
+    } else {
+        pretty_env_logger::formatted_timed_builder()
+            .filter_level(level_filter)
+            .filter_module("rustls", log::LevelFilter::Error)
+            .init();
+    }
+
+    let client_resources = user_config.general
+        .get_client_resource_folder()
+        .expect("Failed to create the client resource folder");
+
+    for entry in std::fs::read_dir(client_resources).expect("Failed to read client resource folder!") {
+        if let Ok(entry) = entry {
+            if entry.path().is_file() {
+                if let Ok(metadata) = entry.metadata() {
+                    if let Some(filename) = entry.path().file_name().map(|s| s.to_string_lossy()) {
+                        let mut name = filename.to_string();
+                        if !name.starts_with("/") {
+                            name = format!("/{name}");
+                        }
+                        user_config.mods.push((name, metadata.len() as usize));
+                    }
+                }
+            }
+        }
+    }
+
+    debug!("Mods: {:?}", user_config.mods);
+
+    let user_config = Arc::new(user_config);
+
+    let (cmd_tx, cmd_rx) = mpsc::channel(100);
+    let (status_tx, status_rx) = mpsc::channel(100);
+
+    if !args.disable_tui {
+        tokio::spawn(tui::tui_main(user_config.clone(), cmd_tx, status_rx));
+    }
+
+    server_main(user_config, cmd_rx, status_tx).await;
+}
+
+async fn server_main(user_config: Arc<config::Config>, mut cmd_rx: mpsc::Receiver<Vec<String>>, status_tx: mpsc::Sender<server::ServerStatus>) {
+    let (hb_tx, hb_rx) = mpsc::channel(100);
+
+    tokio::spawn(heartbeat::backend_heartbeat(user_config.clone(), hb_rx));
+
+    let mut server = server::Server::new(user_config)
+        .await
+        .map_err(|e| error!("{:?}", e))
+        .expect("Failed to start server!");
+
+    let mut status = server.get_server_status();
+    hb_tx.send(status.clone()).await;
+    status_tx.send(status.clone()).await;
+    'server: loop {
+        // TODO: Error handling
+        if server.clients.len() > 0 {
+            tokio::select! {
+                ret = server::read_tcp(&mut server.clients) => {
+                    match ret {
+                        Ok(ret) => if let Some((index, packet)) = ret {
+                            server.process_tcp(index, packet).await;
+                        },
+                        Err(e) => error!("Error: {e}"),
+                    }
+                }
+                ret = server::read_udp(&mut server.udp_socket) => {
+                    if let Some((addr, packet)) = ret {
+                        server.process_udp(addr, packet).await;
+                    }
+                }
+                _ = tokio::time::sleep(tokio::time::Duration::from_millis(50)) => {}
+            }
+        } else {
+            // TODO: Scuffed?
+            tokio::time::sleep(tokio::time::Duration::from_millis(150)).await;
+        }
+
+        if let Err(e) = server.process().await {
+            error!("{:?}", e);
+        }
+
+        let new_status = server.get_server_status();
+
+        if status != new_status {
+            status = new_status;
+            hb_tx.send(status.clone()).await;
+            status_tx.send(status.clone()).await;
+        }
+
+        // Process commands
+        match cmd_rx.try_recv() {
+            Ok(cmd) => if cmd.len() > 0 {
+                match cmd[0].as_str() {
+                    "exit" => {
+                        server.close().await;
+                        break 'server;
+                    },
+                    "players" => {
+                        let mut pl = "Players:\n".to_string();
+                        for (i, (id, player)) in status.player_list.iter().enumerate() {
+                            pl.push_str(&format!("\t[{: >2}] - {player}", id));
+                            if i + 1 < status.player_list.len() {
+                                pl.push('\n');
+                            }
+                        }
+                        info!("{}", pl);
+                    },
+                    "say" => {
+                        let msg = cmd[1..].iter().map(|s| s.as_str()).collect::<Vec<&str>>().join(" ");
+                        server.send_chat_message(&msg, None).await;
+                    },
+                    _ => info!("Unknown command!"),
+                }
+            } else {
+                // what!
+            },
+            Err(mpsc::error::TryRecvError::Empty) => {},
+            Err(e) => {
+                error!("Error: {e}");
+                break;
+            },
+        }
+    }
+}
@@ -0,0 +1,19 @@
+use serde::de::DeserializeOwned;
+use std::collections::HashMap;
+
+static BACKEND_URL: &'static str = "backend.beammp.com";
+static AUTH_URL: &'static str = "auth.beammp.com";
+
+pub async fn authentication_request<R: DeserializeOwned>(
+    target: &str,
+    map: HashMap<String, String>,
+) -> anyhow::Result<R> {
+    let client = reqwest::Client::new();
+    let resp = client
+        .post(format!("https://{}/{}", AUTH_URL, target))
+        .json(&map)
+        .send()
+        .await?;
+    // panic!("json: {:?}", resp.text().await);
+    Ok(resp.json().await?)
+}
@@ -0,0 +1,43 @@
+use glam::*;
+
+use std::time::Instant;
+
+#[derive(Default, Clone, Debug)]
+pub struct Car {
+    pub car_json: String,
+
+    pub pos: DVec3,
+    pub rot: DQuat,
+    pub vel: DVec3,
+    pub rvel: DVec3,
+    pub tim: f64,
+    pub ping: f64,
+    pub last_pos_update: Option<Instant>,
+}
+
+impl Car {
+    pub fn new(car_json: String) -> Self {
+        Self {
+            car_json: car_json,
+
+            ..Default::default()
+        }
+    }
+
+    pub fn raw_position(&self) -> DVec3 {
+        self.pos
+    }
+
+    pub fn raw_rotation(&self) -> DQuat {
+        self.rot
+    }
+
+    pub fn position(&self) -> DVec3 {
+        self.pos + self.vel * self.last_pos_update.map(|t| t.elapsed().as_secs_f64()).unwrap_or(0.0)
+    }
+
+    pub fn rotation(&self) -> DQuat {
+        let t = self.last_pos_update.map(|t| t.elapsed().as_secs_f64()).unwrap_or(0.0);
+        self.rot + DQuat::from_euler(glam::EulerRot::YXZ, self.rvel.x * t, self.rvel.y * t, self.rvel.z * t)
+    }
+}
@@ -0,0 +1,535 @@
+use std::collections::HashMap;
+use std::net::SocketAddr;
+use std::ops::DerefMut;
+use std::path::Path;
+use std::sync::Arc;
+
+use tokio::io::{AsyncReadExt, AsyncWriteExt};
+use tokio::net::{
+    tcp::{OwnedReadHalf, OwnedWriteHalf},
+    TcpStream,
+};
+use tokio::sync::mpsc::{Receiver, Sender};
+use tokio::sync::Mutex;
+use tokio::task::JoinHandle;
+
+use serde::Deserialize;
+use crate::fs_util;
+
+use super::backend::*;
+use super::car::*;
+use super::packet::*;
+
+lazy_static! {
+    pub static ref TAKEN_PLAYER_IDS: Mutex<Vec<u8>> = Mutex::new(Vec::new());
+    pub static ref CLIENT_MOD_PROGRESS: Mutex<HashMap<u8, isize>> = Mutex::new(HashMap::new());
+}
+
+// TODO: Return a proper error?
+async fn claim_id() -> Result<u8, ()> {
+    let mut lock = TAKEN_PLAYER_IDS.lock().await;
+    for index in 0..=255 {
+        if !lock.contains(&index) {
+            lock.push(index);
+            return Ok(index);
+        }
+    }
+    // requires more then 255 players on the server to error
+    Err(())
+}
+
+async fn free_id(id: u8) {
+    let mut lock = TAKEN_PLAYER_IDS.lock().await;
+    *lock = lock.drain(..).filter(|i| *i != id).collect::<Vec<u8>>();
+}
+
+#[derive(PartialEq)]
+pub enum ClientState {
+    None,
+    Connecting,
+    SyncingResources,
+    Syncing,
+    Disconnect,
+}
+
+#[derive(Deserialize, Debug, PartialEq, Clone)]
+pub struct UserData {
+    pub uid: String,
+    pub createdAt: String,
+    pub guest: bool,
+    pub roles: String,
+    pub username: String,
+}
+
+pub struct Client {
+    pub id: u8,
+    pub udp_addr: Option<SocketAddr>,
+
+    socket: OwnedReadHalf,
+    write_half: Arc<Mutex<OwnedWriteHalf>>,
+    write_runtime: JoinHandle<()>,
+    write_runtime_sender: Sender<Packet>,
+
+    pub state: ClientState,
+    pub info: Option<UserData>,
+    pub cars: Vec<(u8, Car)>,
+}
+
+impl Drop for Client {
+    fn drop(&mut self) {
+        tokio::spawn(free_id(self.id));
+        self.write_runtime.abort();
+    }
+}
+
+impl Client {
+    pub async fn new(socket: TcpStream) -> Self {
+        let id = match claim_id().await {
+            Ok(v) => v,
+            Err(_) => panic!("CRITICAL: Saturated Player ID's"),
+        };
+        trace!("Client with ID #{} created!", id);
+
+        let (read_half, write_half) = socket.into_split();
+        let (tx, mut rx): (Sender<Packet>, Receiver<Packet>) = tokio::sync::mpsc::channel(128);
+        let write_half = Arc::new(Mutex::new(write_half));
+        let write_half_ref = Arc::clone(&write_half);
+        let handle: JoinHandle<()> = tokio::spawn(async move {
+            loop {
+                if let Some(packet) = rx.recv().await {
+                    // trace!("Runtime received packet...");
+                    let mut lock = write_half_ref.lock().await;
+                    // trace!("Runtime sending packet!");
+                    if let Err(e) = tcp_write(lock.deref_mut(), packet).await {
+                        error!("{:?}", e);
+                    };
+                    // trace!("Runtime sent packet!");
+                    drop(lock);
+                }
+            }
+        });
+
+        Self {
+            id: id,
+            udp_addr: None,
+
+            socket: read_half,
+            write_half: write_half,
+            write_runtime: handle,
+            write_runtime_sender: tx,
+
+            state: ClientState::Connecting,
+            info: None,
+            cars: Vec::new(),
+        }
+    }
+
+    pub async fn authenticate(&mut self, config: &super::Config) -> anyhow::Result<bool> {
+        debug!("Authenticating client {}...", self.id);
+
+        // TODO: Check client version
+        trace!("Client version packet");
+        self.socket.readable().await?;
+        let packet = self.read_packet_waiting().await?;
+        debug!("{:?}", packet);
+
+        self.write_packet(Packet::Raw(RawPacket::from_code('S')))
+            .await?;
+
+        self.socket.readable().await?;
+        if let Some(packet) = self.read_packet_waiting().await? {
+            debug!("packet: {:?}", packet);
+            if packet.data.len() > 50 {
+                self.kick("Player key too big!").await;
+                return Err(ClientError::AuthenticateError.into());
+            }
+            let mut json = HashMap::new();
+            let key = packet.data_as_string();
+            debug!("[AUTH] key: {}", key);
+            json.insert("key".to_string(), key);
+            let user_data: UserData =
+                authentication_request("pkToUser", json)
+                    .await
+                    .map_err(|e| {
+                        error!("[AUTH] {:?}", e);
+                        e
+                    })?;
+            debug!("user_data: {:?}", user_data);
+            self.info = Some(user_data);
+
+            // self.write_packet(Packet::Raw(RawPacket::from_code('S')))
+            //     .await?;
+        } else {
+            self.kick(
+                "Client never sent public key! If this error persists, try restarting your game.",
+            )
+            .await;
+        }
+
+        self.write_packet(Packet::Raw(RawPacket::from_str(&format!("P{}", self.id))))
+            .await?;
+
+        self.state = ClientState::SyncingResources;
+
+        debug!(
+            "Authentication of client {} succesfully completed! Syncing now...",
+            self.id
+        );
+        self.sync(config).await?;
+
+        Ok(true)
+    }
+
+    // TODO: https://github.com/BeamMP/BeamMP-Server/blob/master/src/TNetwork.cpp#L619
+    pub async fn sync(&mut self, config: &super::Config) -> anyhow::Result<()> {
+        'syncing: while self.state == ClientState::SyncingResources {
+            self.socket.readable().await?;
+            if let Some(packet) = self.read_packet().await? {
+                if (packet.data.len() == 4 && packet.data == [68, 111, 110, 101]) || packet.data.len() == 0 {
+                    {
+                        let mut lock = CLIENT_MOD_PROGRESS.lock().await;
+                        lock.insert(self.id, -1);
+                    }
+                    break 'syncing;
+                }
+                match packet.data[0] as char {
+                    'S' if packet.data.len() > 1 => match packet.data[1] as char {
+                        'R' => {
+                            let file_packet = if config.mods.len() == 0 {
+                                RawPacket::from_code('-')
+                            } else {
+                                let mut file_data = String::new();
+                                // TODO: Collapse these 2 loops into 1
+                                for (name, _size) in &config.mods {
+                                    let mut mod_name = name.clone();
+                                    if mod_name.starts_with("/") == false {
+                                        mod_name = format!("/{mod_name}");
+                                    }
+                                    file_data.push_str(&format!("{mod_name};"));
+                                }
+                                for (_name, size) in &config.mods {
+                                    file_data.push_str(&format!("{size};"));
+                                }
+                                RawPacket::from_str(&file_data)
+                            };
+                            // let file_packet = RawPacket::from_code('-');
+                            self.write_packet(Packet::Raw(file_packet))
+                                .await?;
+                        }
+                        _ => error!("Unknown packet! {:?}", packet),
+                    }
+                    'f' => {
+                        // Handle file download
+                        let mut mod_name = packet.data_as_string().clone();
+                        mod_name.remove(0); // Remove f
+                        debug!("Client is requesting file {}", mod_name);
+
+                        let client_resources = config.general.get_client_resource_folder()?;
+                        let mod_path = fs_util::join_path_secure(Path::new(&client_resources), Path::new(&mod_name))?;
+
+                        if !mod_path.exists() || !mod_path.is_file() {
+                            error!("Client requested mod which doesn't exist: {:?}. Disconnecting", mod_path);
+                            self.kick("Invalid mod request").await;
+                            return Ok(()) // client requested mod that doesnt exists within "Resources/Client/*"
+                        }
+
+                        self.write_packet(Packet::Raw(RawPacket::from_str("AG"))).await?;
+
+                        let mut mod_id = 0;
+                        for (i, (bmod_name, _bmod_size)) in config.mods.iter().enumerate() {
+                            if bmod_name == &mod_name {
+                                mod_id = i;
+                            }
+                        }
+
+                        // Send the first half of the file over this socket and the other over the DSocket
+                        let file_data = std::fs::read(mod_path)?;
+                        {
+                            let mut lock = self.write_half.lock().await;
+                            lock.writable().await?;
+                            trace!("Sending packets!");
+                            if let Err(e) = lock.write(&file_data[..(file_data.len()/2)]).await {
+                                error!("{:?}", e);
+                            }
+                            trace!("Packets sent!");
+                            drop(lock);
+                        }
+
+                        {
+                            let mut lock = CLIENT_MOD_PROGRESS.lock().await;
+                            lock.insert(self.id, mod_id as isize);
+                        }
+                    }
+                    _ => error!("Unknown packet! {:?}", packet),
+                }
+            }
+        }
+        self.state = ClientState::None;
+        trace!("Done syncing! Sending map name...");
+        self.write_packet(Packet::Raw(RawPacket::from_str(&format!(
+            "M{}",
+            config.general.map
+        ))))
+        .await?;
+        trace!("Map name sent!");
+        Ok(())
+    }
+
+    /// This function should never block. It should simply check if there's a
+    /// packet, and then and only then should it read it. If this were to block, the server
+    /// would come to a halt until this function unblocks.
+    pub async fn process(&mut self) -> anyhow::Result<Option<RawPacket>> {
+        if let Some(packet) = self.read_packet().await? {
+            return Ok(Some(packet));
+        }
+        Ok(None)
+    }
+
+    pub async fn process_blocking(&mut self) -> anyhow::Result<Option<RawPacket>> {
+        if let Some(packet) = self.read_packet_waiting().await? {
+            return Ok(Some(packet));
+        }
+        Ok(None)
+    }
+
+    pub fn disconnect(&mut self) {
+        self.state = ClientState::Disconnect;
+    }
+
+    pub async fn kick(&mut self, msg: &str) {
+        // let _ = self.socket.writable().await;
+        // let _ = self.write_packet(Packet::Raw(RawPacket::from_str(&format!("K{}", msg)))).await;
+        // self.disconnect();
+        let _ = self
+            .write_packet(Packet::Raw(RawPacket::from_str(&format!("K{}", msg))))
+            .await;
+        self.disconnect();
+    }
+
+    pub fn get_userdata(&self) -> UserData {
+        self.info.as_ref().unwrap().clone()
+    }
+
+    // Panics when userdata is not set!
+    pub fn get_name(&self) -> &str {
+        &self.info.as_ref().unwrap().username
+    }
+
+    pub fn get_id(&self) -> u8 {
+        self.id
+    }
+
+    // Panics when userdata is not set!
+    pub fn get_roles(&self) -> &str {
+        &self.info.as_ref().unwrap().roles
+    }
+
+    pub fn register_car(&mut self, car: Car) -> u8 {
+        let mut free_num = 0;
+        for (num, _) in &self.cars {
+            if num == &free_num {
+                free_num += 1;
+            } else {
+                break;
+            }
+        }
+        self.cars.push((free_num, car));
+        free_num
+    }
+
+    pub fn unregister_car(&mut self, car_id: u8) {
+        let prev_len = self.cars.len();
+        self.cars.retain(|(id, _)| id != &car_id);
+        if prev_len == self.cars.len() {
+            error!(
+                "Failed to unregister car #{} for client #{}! Ignoring for now...",
+                car_id, self.id
+            );
+        }
+    }
+
+    pub fn get_car_mut(&mut self, mut car_id: u8) -> Option<&mut Car> {
+        for (num, car) in &mut self.cars {
+            if num == &mut car_id {
+                return Some(car);
+            }
+        }
+        None
+    }
+
+    async fn read_raw(&mut self, count: usize) -> anyhow::Result<Vec<u8>> {
+        let mut b = vec![0u8; count];
+        self.socket.read_exact(&mut b).await?;
+        Ok(b)
+    }
+
+    async fn read_packet_waiting(&mut self) -> anyhow::Result<Option<RawPacket>> {
+        let start = std::time::Instant::now();
+        'wait: loop {
+            if let Some(packet) = self.read_packet().await? {
+                return Ok(Some(packet));
+            }
+            if start.elapsed().as_secs() >= 5 {
+                break 'wait;
+            }
+            tokio::time::sleep(std::time::Duration::from_millis(500)).await;
+        }
+        Err(ClientError::ConnectionTimeout.into())
+    }
+
+    /// Must be non-blocking
+    async fn read_packet(&mut self) -> anyhow::Result<Option<RawPacket>> {
+        let mut header = [0u8; 4];
+        match self.socket.try_read(&mut header) {
+            Ok(0) => {
+                error!("Socket is readable, yet has 0 bytes to read! Disconnecting client...");
+                self.disconnect();
+                return Ok(None);
+            }
+            Ok(_n) => {}
+            Err(ref e) if e.kind() == std::io::ErrorKind::WouldBlock => {
+                return Ok(None);
+            }
+            Err(e) => return Err(e.into()),
+        }
+
+        let expected_size = u32::from_le_bytes(header) as usize;
+        let mut data = Vec::new();
+        let mut tmp_data = vec![0u8; expected_size];
+        let mut data_size = 0;
+        while data_size < expected_size {
+            match self.socket.try_read(&mut tmp_data) {
+                Ok(0) => {
+                    error!("Socket is readable, yet has 0 bytes to read! Disconnecting client...");
+                    self.disconnect();
+                    return Ok(None);
+                }
+                Ok(n) => {
+                    data_size += n;
+                    data.extend_from_slice(&tmp_data[..n]);
+                },
+                Err(ref e) if e.kind() == std::io::ErrorKind::WouldBlock => {
+                    // debug!("Packet appears to be ready, yet can't be read yet!");
+                    // self.socket.read(&mut data).await?;
+                    return Ok(None);
+                }
+                Err(e) => return Err(e.into()),
+            }
+        }
+
+        Ok(Some(RawPacket {
+            header: data_size as u32,
+            data: data[..data_size].to_vec(),
+        }))
+    }
+
+    /// Blocking write
+    pub async fn write_packet(&mut self, packet: Packet) -> anyhow::Result<()> {
+        let mut lock = self.write_half.lock().await;
+        lock.writable().await?;
+        trace!("Sending packet!");
+        if let Err(e) = tcp_write(lock.deref_mut(), packet).await {
+            error!("{:?}", e);
+        }
+        trace!("Packet sent!");
+        drop(lock);
+        Ok(())
+    }
+
+    pub async fn queue_packet(&self, packet: Packet) {
+        // TODO: If packet gets lost, put it back at the front of the queue?
+        let _ = self.write_runtime_sender.send(packet).await;
+    }
+
+    pub async fn trigger_client_event<S: Into<String>, D: Into<String>>(&self, event_name: S, data: D) {
+        let event_name = event_name.into();
+        let data = data.into();
+        debug!("Calling client event '{}' with data '{}'", event_name, data);
+        let packet_data = format!("E:{}:{}", event_name, data);
+        self.queue_packet(Packet::Raw(RawPacket::from_str(&packet_data))).await;
+    }
+}
+
+#[derive(Debug)]
+pub enum ClientError {
+    AuthenticateError,
+    ConnectionTimeout,
+    IsDownloader,
+}
+
+impl std::fmt::Display for ClientError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
+        write!(f, "{:?}", self)?;
+        Ok(())
+    }
+}
+
+impl std::error::Error for ClientError {}
+
+#[async_trait]
+trait Writable {
+    async fn writable(&self) -> std::io::Result<()>;
+}
+
+#[async_trait]
+impl Writable for TcpStream {
+    async fn writable(&self) -> std::io::Result<()> {
+        self.writable().await
+    }
+}
+
+#[async_trait]
+impl Writable for OwnedWriteHalf {
+    async fn writable(&self) -> std::io::Result<()> {
+        self.writable().await
+    }
+}
+
+async fn tcp_write<W: AsyncWriteExt + Writable + std::marker::Unpin>(
+    w: &mut W,
+    mut packet: Packet,
+) -> anyhow::Result<()> {
+    let compressed = match packet.get_code() {
+        Some('O') => true,
+        Some('T') => true,
+        _ => packet.get_data().len() > 400,
+    };
+
+    if compressed {
+        let mut compressed: Vec<u8> = Vec::with_capacity(100_000);
+        let mut compressor = flate2::Compress::new(flate2::Compression::best(), true);
+        compressor.compress_vec(
+            packet.get_data(),
+            &mut compressed,
+            flate2::FlushCompress::Sync,
+        )?;
+        let mut new_data = "ABG:".as_bytes()[..4].to_vec();
+        new_data.append(&mut compressed);
+        packet.set_header(new_data.len() as u32);
+        packet.set_data(new_data);
+    }
+
+    tcp_write_raw(w, packet).await?;
+
+    Ok(())
+}
+
+async fn tcp_write_raw<W: AsyncWriteExt + Writable + std::marker::Unpin>(
+    w: &mut W,
+    mut packet: Packet,
+) -> anyhow::Result<()> {
+    let mut raw_data: Vec<u8> = packet.get_header().to_le_bytes().to_vec();
+    raw_data.extend_from_slice(packet.get_data());
+    w.writable().await?;
+    w.write(&raw_data).await?;
+    Ok(())
+}
+
+async fn tcp_send_file<W: AsyncWriteExt + Writable + std::marker::Unpin>(
+    w: &mut W,
+    file_name: String,
+) -> anyhow::Result<()> {
+    debug!("Sending file '{}'", file_name);
+    tcp_write(w, Packet::Raw(RawPacket::from_str("KYou have not downloaded the mod manually!"))).await?;
+    Ok(())
+}
@@ -0,0 +1,14 @@
+use tokio::io::{AsyncReadExt, AsyncWriteExt};
+use tokio::net::{
+    tcp::{OwnedReadHalf, OwnedWriteHalf},
+    TcpStream,
+};
+
+pub async fn handle_http_get(socket: TcpStream) {
+    let (read_half, write_half) = socket.into_split();
+    todo!()
+}
+
+async fn read_get_request(socket: &mut OwnedReadHalf) {
+    todo!()
+}
@@ -0,0 +1,144 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone)]
+pub enum Packet {
+    Raw(RawPacket),
+    Notification(NotificationPacket),
+}
+
+impl Packet {
+    pub fn get_header(&self) -> u32 {
+        match self {
+            Self::Raw(raw) => raw.header,
+            Self::Notification(msg) => self.get_data().len() as u32,
+        }
+    }
+
+    pub fn get_data(&self) -> &[u8] {
+        match self {
+            Self::Raw(raw) => &raw.data,
+            Self::Notification(p) => p.0.as_bytes(),
+        }
+    }
+
+    pub fn get_code(&self) -> Option<char> {
+        match self {
+            Self::Raw(raw) => raw.data.get(0).map(|c| *c as char),
+            Self::Notification(_) => Some('J'),
+        }
+    }
+
+    pub fn set_data(&mut self, data: Vec<u8>) {
+        match self {
+            Self::Raw(raw) => raw.data = data,
+            Self::Notification(_) => todo!(),
+        }
+    }
+
+    pub fn set_header(&mut self, header: u32) {
+        match self {
+            Self::Raw(raw) => raw.header = header,
+            Self::Notification(_) => todo!(),
+        }
+    }
+
+    pub fn data_as_string(&self) -> String {
+        String::from_utf8_lossy(&self.get_data()).to_string()
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct NotificationPacket(String);
+
+impl NotificationPacket {
+    pub fn new<S: Into<String>>(msg: S) -> Self {
+        Self(format!("J{}", msg.into()))
+    }
+    pub fn player_welcome<S: Into<String>>(msg: S) -> Self {
+        Self(format!("JWelcome {}!", msg.into()))
+    }
+    pub fn player_left<S: Into<String>>(msg: S) -> Self {
+        Self(format!("L{} left the server!", msg.into()))
+    }
+}
+
+/// Protocol:
+/// Header: 4 bytes, contains data size
+/// Data: Contains packet data
+#[derive(Clone)]
+pub struct RawPacket {
+    pub header: u32,
+    pub data: Vec<u8>,
+}
+
+impl RawPacket {
+    pub fn from_code(code: char) -> Self {
+        Self {
+            header: 1,
+            data: vec![code as u8],
+        }
+    }
+
+    pub fn from_data(data: Vec<u8>) -> Self {
+        Self {
+            header: data.len() as u32,
+            data,
+        }
+    }
+
+    pub fn from_str(str_data: &str) -> Self {
+        let data = str_data.as_bytes().to_vec();
+        Self {
+            header: data.len() as u32,
+            data: data,
+        }
+    }
+
+    pub fn data_as_string(&self) -> String {
+        String::from_utf8_lossy(&self.data).to_string()
+    }
+}
+
+impl std::fmt::Debug for RawPacket {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
+        write!(
+            f,
+            "Header: `{:?}` - Bytes: `{:?}` - String: `{}`",
+            self.header,
+            self.data,
+            self.data_as_string()
+        )?;
+        Ok(())
+    }
+}
+
+#[derive(Default, Serialize, Deserialize)]
+pub struct RespawnPacketData {
+    pub pos: RespawnPacketDataPos,
+    pub rot: RespawnPacketDataRot,
+}
+
+#[derive(Default, Serialize, Deserialize)]
+pub struct RespawnPacketDataPos {
+    pub x: f64,
+    pub y: f64,
+    pub z: f64,
+}
+
+#[derive(Default, Serialize, Deserialize)]
+pub struct RespawnPacketDataRot {
+    pub x: f64,
+    pub y: f64,
+    pub z: f64,
+    pub w: f64,
+}
+
+#[derive(Default, Serialize, Deserialize)]
+pub struct TransformPacket {
+    pub rvel: [f64; 3],
+    pub tim: f64,
+    pub pos: [f64; 3],
+    pub ping: f64,
+    pub rot: [f64; 4],
+    pub vel: [f64; 3],
+}
@@ -0,0 +1,334 @@
+use super::{
+    Backend,
+    ServerBoundPluginEvent,
+    PluginBoundPluginEvent,
+    ScriptEvent,
+    Argument
+};
+
+use std::sync::{Arc, Mutex};
+use std::collections::HashMap;
+
+use tokio::sync::mpsc::{Sender, Receiver};
+use tokio::sync::oneshot;
+
+use mlua::prelude::*;
+use mlua::{UserData, UserDataMethods, Value, Function, Variadic};
+
+#[derive(Clone)]
+struct Context {
+    tx: Arc<Sender<ServerBoundPluginEvent>>,
+
+    handlers: Arc<Mutex<HashMap<String, String>>>,
+}
+
+impl Context {
+    fn new(tx: Arc<Sender<ServerBoundPluginEvent>>) -> Self {
+        Self {
+            tx,
+
+            handlers: Arc::new(Mutex::new(HashMap::new())),
+        }
+    }
+}
+
+impl<'lua> FromLua<'lua> for Context {
+    fn from_lua(value: Value<'lua>, _: &'lua Lua) -> LuaResult<Self> {
+        match value {
+            Value::UserData(ud) => Ok(ud.borrow::<Self>()?.clone()),
+            _ => unreachable!()
+        }
+    }
+}
+
+impl UserData for Context {
+    fn add_methods<'lua, M: UserDataMethods<'lua, Self>>(methods: &mut M) {
+        // Implement all the API functions here
+
+        methods.add_function("RegisterEventHandler", |lua, (event_name, handler_name): (String, String)| {
+            debug!("Event handler registered: {} (EVENT) = {} (LUA)", event_name, handler_name);
+            let me: Context = lua.globals().get("MP")?;
+            me.handlers.lock().expect("Lock is poisoned!").insert(event_name, handler_name);
+            Ok(())
+        });
+
+        methods.add_function("GetServerVersion", |_lua, ()| {
+            Ok((3, 3, 0))
+        });
+
+        methods.add_function("GetPlayerCount", |lua, ()| {
+            let me: Context = lua.globals().get("MP")?;
+            let (tx, rx) = oneshot::channel();
+            if let Err(e) = me.tx.blocking_send(ServerBoundPluginEvent::RequestPlayerCount(tx)) {
+                error!("Failed to send packet: {:?}", e);
+            }
+            let message = rx.blocking_recv();
+            if let Ok(message) = message {
+                if let PluginBoundPluginEvent::PlayerCount(player_count) = message {
+                    Ok(player_count)
+                } else {
+                    unreachable!() // This really should never be reachable
+                }
+            } else {
+                todo!("Receiving a response from the server failed! How?")
+            }
+        });
+
+        methods.add_function("GetPlayers", |lua, ()| {
+            let me: Context = lua.globals().get("MP")?;
+            let (tx, rx) = oneshot::channel();
+            if let Err(e) = me.tx.blocking_send(ServerBoundPluginEvent::RequestPlayers(tx)) {
+                error!("Failed to send packet: {:?}", e);
+            }
+            let message = rx.blocking_recv();
+            if let Ok(message) = message {
+                if let PluginBoundPluginEvent::Players(players) = message {
+                    let table = lua.create_table()?;
+                    for (id, name) in players {
+                        table.set(id, name)?;
+                    }
+                    Ok(table)
+                } else {
+                    unreachable!() // This really should never be reachable
+                }
+            } else {
+                todo!("Receiving a response from the server failed! How?")
+            }
+        });
+
+        methods.add_function("GetPlayerIdentifiers", |lua, (id,): (u8,)| {
+            let me: Context = lua.globals().get("MP")?;
+            let (tx, rx) = oneshot::channel();
+            if let Err(e) = me.tx.blocking_send(ServerBoundPluginEvent::RequestPlayerIdentifiers((id, tx))) {
+                error!("Failed to send packet: {:?}", e);
+            }
+            let message = rx.blocking_recv();
+            if let Ok(message) = message {
+                match message {
+                    PluginBoundPluginEvent::PlayerIdentifiers(identifiers) => {
+                        let table = lua.create_table()?;
+                        table.set("id", identifiers.ip)?;
+                        table.set("beammp_id", identifiers.beammp_id)?;
+                        Ok(Value::Table(table))
+                    },
+                    PluginBoundPluginEvent::None => Ok(Value::Nil),
+                    _ => unreachable!() // This should really never be reachable
+                }
+            } else {
+                todo!("Receiving a response from the server failed! How?")
+            }
+        });
+
+        methods.add_function("GetPlayerName", |lua, (id,): (u8,)| {
+            let me: Context = lua.globals().get("MP")?;
+            // We can simply request all player names and pick the one we need
+            let (tx, rx) = oneshot::channel();
+            if let Err(e) = me.tx.blocking_send(ServerBoundPluginEvent::RequestPlayers(tx)) {
+                error!("Failed to send packet: {:?}", e);
+            }
+            let message = rx.blocking_recv();
+            if let Ok(message) = message {
+                if let PluginBoundPluginEvent::Players(players) = message {
+                    let mut name = None;
+                    'search: for (pid, pname) in players {
+                        if pid == id {
+                            name = Some(pname);
+                            break 'search;
+                        }
+                    }
+                    Ok(name)
+                } else {
+                    unreachable!() // This really should never be reachable
+                }
+            } else {
+                todo!("Receiving a response from the server failed! How?")
+            }
+        });
+
+        methods.add_function("GetPlayerVehicles", |lua, (id,): (u8,)| {
+            let me: Context = lua.globals().get("MP")?;
+            let (tx, rx) = oneshot::channel();
+            if let Err(e) = me.tx.blocking_send(ServerBoundPluginEvent::RequestPlayerVehicles((id, tx))) {
+                error!("Failed to send packet: {:?}", e);
+            }
+            let message = rx.blocking_recv();
+            if let Ok(message) = message {
+                if let PluginBoundPluginEvent::PlayerVehicles(vehicles) = message {
+                    let table = lua.create_table()?;
+                    for (vid, veh_json) in vehicles {
+                        table.set(vid, veh_json)?;
+                    }
+                    Ok(table)
+                } else {
+                    unreachable!() // This really should never be reachable
+                }
+            } else {
+                todo!("Receiving a response from the server failed! How?")
+            }
+        });
+
+        methods.add_function("GetPositionRaw", |lua, (pid, vid): (u8, u8)| {
+            let me: Context = lua.globals().get("MP")?;
+            let (tx, rx) = oneshot::channel();
+            if let Err(e) = me.tx.blocking_send(ServerBoundPluginEvent::RequestPositionRaw((pid, vid, tx))) {
+                error!("Failed to send packet: {:?}", e);
+            }
+            let message = rx.blocking_recv();
+            if let Ok(message) = message {
+                match message {
+                    PluginBoundPluginEvent::PositionRaw(pos_raw) => {
+                        let pos_table = lua.create_table()?;
+                        pos_table.set("x", pos_raw.pos[0])?;
+                        pos_table.set("y", pos_raw.pos[1])?;
+                        pos_table.set("z", pos_raw.pos[2])?;
+
+                        let rot_table = lua.create_table()?;
+                        pos_table.set("x", pos_raw.rot[0])?;
+                        pos_table.set("y", pos_raw.rot[1])?;
+                        pos_table.set("z", pos_raw.rot[2])?;
+                        pos_table.set("w", pos_raw.rot[3])?;
+
+                        let table = lua.create_table()?;
+                        table.set("pos", pos_table)?;
+                        table.set("rot", rot_table)?;
+                        Ok(Value::Table(table))
+                    },
+                    PluginBoundPluginEvent::None => Ok(Value::Nil),
+                    _ => unreachable!() // This really should never be reachable
+                }
+            } else {
+                todo!("Receiving a response from the server failed! How?")
+            }
+        });
+
+        methods.add_function("SendChatMessage", |lua, (id, msg): (isize, String)| {
+            let me: Context = lua.globals().get("MP")?;
+            if let Err(e) = me.tx.blocking_send(ServerBoundPluginEvent::SendChatMessage((id, msg))) {
+                error!("Failed to send packet: {:?}", e);
+            }
+            Ok(())
+        });
+
+        methods.add_function("GetOSName", |lua, ()| {
+            Ok(std::env::consts::OS)
+        });
+    }
+}
+
+pub struct BackendLua {
+    lua: Lua,
+}
+
+impl BackendLua {
+    pub fn new() -> Self {
+        let lua = Lua::new();
+
+        Self {
+            lua,
+        }
+    }
+}
+
+impl Backend for BackendLua {
+    fn load(&mut self, code: String) -> anyhow::Result<()> {
+        self.lua.load(code).exec().map_err(|e| { error!("[LUA] {:?}", e); e })?;
+        Ok(())
+    }
+
+    fn load_api(&mut self, tx: Arc<Sender<ServerBoundPluginEvent>>) -> anyhow::Result<()> {
+        let print_fn = self.lua.create_function(|_lua, (msg,): (String,)| {
+            info!("[LUA] {}", msg);
+            Ok(())
+        })?;
+
+        let api = Context::new(tx);
+
+        let globals = self.lua.globals();
+        globals.set("MP", api)?;
+        globals.set("print", print_fn)?;
+
+        Ok(())
+    }
+
+    fn call_event_handler(&mut self, event: ScriptEvent, resp: Option<oneshot::Sender<Argument>>) {
+        let (event_name, args) = match event {
+            ScriptEvent::OnPluginLoaded => ("onInit", vec![]),
+            ScriptEvent::OnShutdown => ("onShutdown", vec![]),
+
+            ScriptEvent::OnPlayerAuthenticated { name, role, is_guest, identifiers } => ("onPlayerAuth", vec![Argument::String(name), Argument::String(role), Argument::Boolean(is_guest), Argument::Table(identifiers.to_map())]),
+            ScriptEvent::OnPlayerConnecting { pid } => ("onPlayerConnecting", vec![Argument::Integer(pid as i64)]),
+            ScriptEvent::OnPlayerJoining { pid } => ("onPlayerJoining", vec![Argument::Integer(pid as i64)]),
+
+            ScriptEvent::OnPlayerDisconnect { pid, name } => ("onPlayerDisconnect", vec![Argument::Integer(pid as i64), Argument::String(name)]),
+
+            ScriptEvent::OnVehicleSpawn { pid, vid, car_data } => ("onVehicleSpawn", vec![Argument::Integer(pid as i64), Argument::Integer(vid as i64), Argument::String(car_data)]),
+            ScriptEvent::OnVehicleEdited { pid, vid, car_data } => ("onVehicleEdited", vec![Argument::Integer(pid as i64), Argument::Integer(vid as i64), Argument::String(car_data)]),
+            ScriptEvent::OnVehicleDeleted { pid, vid } => ("onVehicleDeleted", vec![Argument::Integer(pid as i64), Argument::Integer(vid as i64)]),
+            ScriptEvent::OnVehicleReset { pid, vid, car_data } => ("onVehicleReset", vec![Argument::Integer(pid as i64), Argument::Integer(vid as i64), Argument::String(car_data)]),
+
+            ScriptEvent::OnChatMessage { pid, name, message } => ("onChatMessage", vec![Argument::Integer(pid as i64), Argument::String(name), Argument::String(message)]),
+        };
+
+        let mut ret = Value::Number(-1f64);
+        // TODO: Error handling
+        {
+            let ctx: Context = self.lua.globals().get("MP").expect("MP is missing!");
+            let lock = ctx.handlers.lock().expect("Mutex is poisoned!");
+            if let Some(handler_name) = lock.get(event_name) {
+                let func: LuaResult<Function> = self.lua.globals().get(handler_name.clone());
+                if let Ok(func) = func {
+                    let mapped_args = args.into_iter().map(|arg| {
+                        arg_to_value(&self.lua, arg)
+                    }).filter(|v| v.is_some());
+                    match func.call::<_, Value>(Variadic::from_iter(mapped_args)) {
+                        Ok(res) => { trace!("fn ret: {:?}", res); ret = res; }
+                        Err(e) => {
+                            error!("[LUA] {}", e);
+                            ret = Value::Number(-1f64);
+                        },
+                    }
+                }
+            }
+        }
+
+        debug!("sending result...");
+        if let Some(resp) = resp {
+            let arg = value_to_arg(ret);
+            resp.send(arg).expect("Failed to send!");
+        }
+        debug!("call_event_handler done");
+    }
+}
+
+fn value_to_arg(value: Value) -> Argument {
+    match value {
+        Value::Boolean(b) => Argument::Boolean(b),
+        Value::Integer(i) => Argument::Integer(i),
+        Value::Number(f) => Argument::Number(f as f32),
+        Value::String(s) => Argument::String(s.to_string_lossy().to_string()),
+        _ => Argument::Number(-1f32),
+    }
+}
+
+fn arg_to_value(lua: &Lua, arg: Argument) -> Option<Value> {
+    match arg {
+        Argument::String(s) => if let Ok(lua_str) = lua.create_string(&s) { Some(Value::String(lua_str)) } else { None },
+        Argument::Boolean(b) => Some(Value::Boolean(b)),
+        Argument::Number(f) => Some(Value::Number(f as f64)),
+        Argument::Integer(i) => Some(Value::Integer(i as i64)),
+        Argument::Table(t) => {
+            if let Ok(table) = lua.create_table() {
+                for (key, value) in t {
+                    if let Some(v) = arg_to_value(lua, value) {
+                        if let Err(e) = table.set(key, v) {
+                            error!("[LUA] Error occured trying to put data into table: {:?}", e);
+                        }
+                    }
+                }
+                Some(Value::Table(table))
+            } else {
+                None
+            }
+        }
+    }
+}
@@ -0,0 +1,194 @@
+pub mod backend_lua;
+
+use std::sync::Arc;
+use std::collections::HashMap;
+use tokio::runtime::Runtime;
+use tokio::sync::mpsc::{self, Sender, Receiver};
+use tokio::sync::oneshot;
+
+/// NOTE: Send is required as the backend is constructed on the main thread and sent over.
+///       Even if we construct it inside the runtime however, because of tokio, we would
+//        still have to require Send as the runtime might run on different threads (?)
+pub trait Backend: Send {
+    fn load(&mut self, code: String) -> anyhow::Result<()>;
+    fn load_api(&mut self, tx: Arc<Sender<ServerBoundPluginEvent>>) -> anyhow::Result<()>;
+
+    fn call_event_handler(&mut self, event: ScriptEvent, resp: Option<oneshot::Sender<Argument>>);
+}
+
+// TODO: This is quite focused on Lua right now, perhaps in the future we want to modify this list
+//       to be more versatile?
+#[derive(Debug, Clone)]
+pub enum Argument {
+    String(String),
+    Boolean(bool),
+    Number(f32),
+    Integer(i64),
+    Table(HashMap<String, Argument>),
+}
+
+#[derive(Debug)]
+pub struct PlayerIdentifiers {
+    pub ip: String,
+    pub beammp_id: String,
+}
+
+impl PlayerIdentifiers {
+    pub fn to_map(&self) -> HashMap<String, Argument> {
+        let mut m = HashMap::new();
+        m.insert(String::from("ip"), Argument::String(self.ip.clone()));
+        m.insert(String::from("beammp"), Argument::String(self.beammp_id.clone()));
+        m
+    }
+}
+
+#[derive(Debug)]
+pub struct PositionRaw {
+    pub pos: [f32; 3],
+    pub rot: [f32; 4],
+}
+
+impl PositionRaw {
+    pub fn to_map(&self) -> HashMap<String, Argument> {
+        let mut pm = HashMap::new();
+        pm.insert(String::from("x"), Argument::Number(self.pos[0]));
+        pm.insert(String::from("y"), Argument::Number(self.pos[1]));
+        pm.insert(String::from("z"), Argument::Number(self.pos[2]));
+
+        let mut rm = HashMap::new();
+        rm.insert(String::from("x"), Argument::Number(self.rot[0]));
+        rm.insert(String::from("y"), Argument::Number(self.rot[1]));
+        rm.insert(String::from("z"), Argument::Number(self.rot[2]));
+        rm.insert(String::from("w"), Argument::Number(self.rot[3]));
+
+        let mut m = HashMap::new();
+        m.insert(String::from("pos"), Argument::Table(pm));
+        m.insert(String::from("rot"), Argument::Table(rm));
+        m
+    }
+}
+
+#[derive(Debug)]
+pub enum ScriptEvent {
+    OnPluginLoaded,
+    OnShutdown,
+
+    // TODO: Because of limitations in how we accept clients, onPlayerAuth runs after mod downloading and syncing
+    //       has already happened. With some reworking, this can be avoided, but it's not easy.
+    //       This is quite important however, because otherwise mod downloads will get triggered
+    //       constantly even when someone isn't allowed to join!
+    OnPlayerAuthenticated { name: String, role: String, is_guest: bool, identifiers: PlayerIdentifiers },
+    // TODO: See the comment above, this results in these 2 events being useless for now.
+    //       I've simply left them in for backwards compatibility for now!
+    OnPlayerConnecting { pid: u8 },
+    OnPlayerJoining { pid: u8 },
+
+    OnPlayerDisconnect { pid: u8, name: String },
+
+    OnVehicleSpawn { pid: u8, vid: u8, car_data: String },
+    OnVehicleEdited { pid: u8, vid: u8, car_data: String },
+    OnVehicleDeleted { pid: u8, vid: u8 },
+    OnVehicleReset { pid: u8, vid: u8, car_data: String },
+
+    OnChatMessage { pid: u8, name: String, message: String },
+}
+
+#[derive(Debug)]
+pub enum PluginBoundPluginEvent {
+    None,
+
+    CallEventHandler((ScriptEvent, Option<oneshot::Sender<Argument>>)),
+
+    PlayerCount(usize),
+    Players(HashMap<u8, String>),
+    PlayerIdentifiers(PlayerIdentifiers),
+
+    PlayerVehicles(HashMap<u8, String>),
+    PositionRaw(PositionRaw),
+}
+
+// TODO: Perhaps it would be nice to ensure each sender can only sned specifically what it needs to.
+//       Purely to ensure type safety and slightly cleaner code on the backend implementation side.
+#[derive(Debug)]
+pub enum ServerBoundPluginEvent {
+    PluginLoaded,
+
+    RequestPlayerCount(oneshot::Sender<PluginBoundPluginEvent>),
+    RequestPlayers(oneshot::Sender<PluginBoundPluginEvent>),
+    RequestPlayerIdentifiers((u8, oneshot::Sender<PluginBoundPluginEvent>)),
+
+    RequestPlayerVehicles((u8, oneshot::Sender<PluginBoundPluginEvent>)),
+    RequestPositionRaw((u8, u8, oneshot::Sender<PluginBoundPluginEvent>)),
+
+    SendChatMessage((isize, String)),
+}
+
+pub struct Plugin {
+    runtime: Runtime,
+    tx: Sender<PluginBoundPluginEvent>,
+    rx: Receiver<ServerBoundPluginEvent>,
+}
+
+impl Plugin {
+    pub fn new(mut backend: Box<dyn Backend>, src: String) -> anyhow::Result<Self> {
+        let runtime = Runtime::new().expect("Failed to create a tokio Runtime!");
+        let (pb_tx, mut pb_rx) = mpsc::channel(1_000);
+        let (sb_tx, sb_rx) = mpsc::channel(1_000);
+        let sb_tx = Arc::new(sb_tx);
+        runtime.spawn_blocking(move || {
+            if backend.load_api(sb_tx.clone()).is_ok() {
+                if backend.load(src).is_ok() {
+                    if sb_tx.blocking_send(ServerBoundPluginEvent::PluginLoaded).is_err() {
+                        error!("Plugin communication channels somehow already closed!");
+                        return;
+                    }
+                }
+            }
+
+            loop {
+                if let Some(message) = pb_rx.blocking_recv() {
+                    match message {
+                        PluginBoundPluginEvent::CallEventHandler((event, resp)) => {
+                            backend.call_event_handler(event, resp);
+                        },
+                        _ => {},
+                    }
+                } else {
+                    error!("Event receiver has closed!"); // TODO: We probably want to display the plugin name here too lol
+                    return;
+                }
+            }
+        });
+        Ok(Self {
+            runtime,
+            tx: pb_tx,
+            rx: sb_rx,
+        })
+    }
+
+    pub async fn close(mut self) {
+        let (tx, mut rx) = oneshot::channel();
+        self.send_event(PluginBoundPluginEvent::CallEventHandler((ScriptEvent::OnShutdown, Some(tx)))).await;
+        let _ = rx.await; // We just wait for it to finish shutting down
+        self.runtime.shutdown_background();
+    }
+
+    // TODO: For performance I think we can turn this into an iterator instead of first allocating
+    //       a full vector?
+    pub fn get_events(&mut self) -> Vec<ServerBoundPluginEvent> {
+        let mut events = Vec::new();
+        loop {
+            match self.rx.try_recv() {
+                Ok(event) => events.push(event),
+                Err(mpsc::error::TryRecvError::Disconnected) => break, // TODO: This means the runtime is dead!!! Handle this!!!
+                Err(_) => break,
+            }
+        }
+        events
+    }
+
+    // TODO: Handle error when connection is closed, as it means the runtime is down
+    pub async fn send_event(&self, event: PluginBoundPluginEvent) {
+        let _ = self.tx.send(event).await;
+    }
+}
@@ -0,0 +1,201 @@
+use std::sync::Arc;
+use std::io::{stdout, Result};
+use std::collections::VecDeque;
+use log::Level;
+
+use crossterm::{
+    event::{self, KeyCode, KeyEventKind, KeyModifiers},
+    terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
+    ExecutableCommand,
+};
+use ratatui::{
+    prelude::*,
+    widgets::{Paragraph, Block, Borders},
+};
+
+use tokio::sync::mpsc;
+
+use crate::config::Config;
+use crate::server::ServerStatus;
+
+pub async fn tui_main(config: Arc<Config>, cmd_tx: mpsc::Sender<Vec<String>>, mut info_rx: mpsc::Receiver<ServerStatus>) {
+    let mut tui = Tui::new().expect("Failed to initialize tui!");
+
+    'app: loop {
+        if tui.update(&cmd_tx, &mut info_rx).await.expect("Failed to run tui.update!") {
+            cmd_tx.send(vec!["exit".to_string()]).await.unwrap();
+            break 'app;
+        }
+        tui.draw().expect("Failed to run tui.draw!");
+    }
+}
+
+struct Tui {
+    terminal: Terminal<CrosstermBackend<std::io::Stdout>>,
+
+    log_buffer: VecDeque<(Level, String)>,
+
+    history_scroll: usize,
+    input_history: Vec<String>,
+    input: String,
+
+    server_status: ServerStatus,
+}
+
+impl Drop for Tui {
+    fn drop(&mut self) {
+        if let Err(e) = self.cleanup() {
+            eprintln!("Error occured related to the TUI: {}", e);
+        }
+    }
+}
+
+impl Tui {
+    fn new() -> Result<Self> {
+        stdout().execute(EnterAlternateScreen)?;
+        enable_raw_mode()?;
+
+        let terminal = Terminal::new(CrosstermBackend::new(stdout()))?;
+
+        Ok(Self {
+            terminal,
+
+            log_buffer: VecDeque::new(),
+
+            history_scroll: 0,
+            input_history: Vec::new(),
+            input: String::new(),
+
+            server_status: ServerStatus::default(),
+        })
+    }
+
+    fn cleanup(&self) -> Result<()> {
+        stdout().execute(LeaveAlternateScreen)?;
+        disable_raw_mode()?;
+        Ok(())
+    }
+
+    async fn update(&mut self, cmd_tx: &mpsc::Sender<Vec<String>>, info_rx: &mut mpsc::Receiver<ServerStatus>) -> Result<bool> {
+        for (level, msg) in crate::logger::drain_log_buffer().await {
+            self.log_buffer.push_front((level, msg));
+            if self.log_buffer.len() > 100 {
+                self.log_buffer.pop_back();
+            }
+        }
+
+        match info_rx.try_recv() {
+            Ok(status) => self.server_status = status,
+            Err(mpsc::error::TryRecvError::Empty) => {},
+            Err(e) => return Ok(true),
+        }
+
+        if event::poll(std::time::Duration::from_millis(16))? {
+            if let event::Event::Key(key) = event::read()? {
+                if key.kind == KeyEventKind::Press {
+                    match key.code {
+                        KeyCode::Char(c) if key.modifiers.contains(KeyModifiers::CONTROL) => {
+                            
+                        },
+                        KeyCode::Char(c) => {
+                            let c = if key.modifiers == KeyModifiers::SHIFT { c.to_ascii_uppercase() } else { c };
+                            self.input.push(c);
+                            self.history_scroll = 0;
+                        },
+                        KeyCode::Backspace => { self.input.pop(); },
+                        KeyCode::Enter => {
+                            if self.input.is_empty() == false {
+                                let args = self.input.split(" ").map(|s| s.to_string()).collect::<Vec<String>>();
+                                if let Err(e) = cmd_tx.send(args.clone()).await {
+                                    error!("Error occured sending a command to the server! {e}");
+                                    return Ok(true);
+                                }
+                                self.input_history.insert(0, self.input.clone());
+                                self.input = String::new();
+                                if args.get(0) == Some(&"exit".to_string()) {
+                                    return Ok(true);
+                                }
+                            }
+                        },
+                        KeyCode::Up => {
+                            if self.history_scroll < self.input_history.len() {
+                                self.history_scroll += 1;
+                                self.input = self.input_history[self.history_scroll - 1].clone();
+                            }
+                        },
+                        KeyCode::Down => {
+                            if self.history_scroll > 1 {
+                                self.history_scroll -= 1;
+                                self.input = self.input_history[self.history_scroll - 1].clone();
+                            }
+                        },
+                        _ => {},
+                    }
+                }
+            }
+        }
+
+        Ok(false)
+    }
+
+    fn draw(&mut self) -> Result<()> {
+        self.terminal.draw(|frame| {
+            let area = frame.size();
+
+            let vert_layout = Layout::default()
+                .direction(Direction::Vertical)
+                .constraints(vec![
+                    Constraint::Length(area.height - 3),
+                    Constraint::Length(3),
+                ])
+                .split(area);
+
+            let horiz_layout = Layout::default()
+                .direction(Direction::Horizontal)
+                .constraints(vec![
+                    Constraint::Percentage(70),
+                    Constraint::Percentage(30),
+                ])
+                .split(vert_layout[0]);
+
+            let mut lines = Vec::new();
+            for (i, (level, msg)) in self.log_buffer.iter().enumerate() {
+                if i >= (area.height as usize - 5) { break; }
+                let (level_style, spacer) = match level {
+                    Level::Info => (Style::default().green(), " "),
+                    Level::Warn => (Style::default().yellow(), " "),
+                    Level::Error => (Style::default().red(), ""),
+                    Level::Debug => (Style::default().gray(), ""),
+                    Level::Trace => (Style::default().cyan(), ""),
+                };
+                lines.push(Line::from(vec![
+                    Span::styled("[", Style::default()),
+                    Span::styled(format!("{}", level), level_style),
+                    Span::styled(format!("]{} {}", spacer, msg), Style::default()),
+                ]));
+            }
+            lines.reverse();
+            frame.render_widget(
+                // Paragraph::new("[INFO] info!!!\n[DEBUG] debug!!!!").block(Block::new().borders(Borders::ALL)),
+                Paragraph::new(Text::from(lines)).block(Block::new().borders(Borders::ALL).title("Log")),
+                horiz_layout[0],
+            );
+
+            let mut lines = Vec::new();
+            for (id, name) in &self.server_status.player_list {
+                lines.push(Line::from(format!("{id} - {name}")));
+            }
+            frame.render_widget(
+                Paragraph::new(lines).block(Block::new().borders(Borders::ALL).title("Player List")),
+                horiz_layout[1],
+            );
+
+            frame.render_widget(
+                Paragraph::new(format!(" > {}", self.input)).block(Block::new().borders(Borders::ALL).title("Input")),
+                vert_layout[1],
+            );
+        })?;
+
+        Ok(())
+    }
+}
Author	SHA1	Message	Date
Luuk van Oijen	e58a241b28	implement GetOsName	2023-12-06 13:59:54 +01:00
Luuk van Oijen	bf4c2d120e	wip onvehiclereset implemented	2023-12-05 23:18:52 +01:00
Luuk van Oijen	8b88127e20	support onVehicleDeleted	2023-12-05 14:48:41 +01:00
Luuk van Oijen	6e7b2e0525	Merge branch 'master' of https://github.com/Lucky4Luuk/beammp_rust_server	2023-12-04 16:57:54 +01:00
Luuk van Oijen	1e6c2ea680	Update mod.rs	2023-12-04 16:57:53 +01:00
Luuk van Oijen	140b43a18c	wip stuff	2023-12-04 11:16:48 +01:00
Luuk van Oijen	b8211166ad	mostly finished get position raw stuff	2023-11-30 16:27:23 +01:00
Luuk van Oijen	8e1d235dee	switched over to glam and simplified some imports	2023-11-30 15:35:22 +01:00
Luuk van Oijen	dc61d4649c	wip position raw event	2023-11-30 15:28:35 +01:00
Luuk van Oijen	03ac847683	implemented cancellable vehicle edits	2023-11-30 11:25:17 +01:00
Luuk van Oijen	3dde6a76cb	Merge pull request #14 from lionkor/fix-modloading fix mod loading	2023-11-29 22:47:28 +01:00
Lion Kortlepel	87a0d46b00	fix mod loading it was using the wrong path because i broke it :)	2023-11-29 22:44:25 +01:00
Luuk van Oijen	452a4c5e16	cancellable vehicle spawns	2023-11-28 19:22:03 +01:00
Luuk van Oijen	adfda5a8cb	Update backend_lua.rs	2023-11-28 14:05:31 +01:00
Luuk van Oijen	14097b6c68	oops forgot to filter the non-tui logger too	2023-11-28 11:18:47 +01:00
Luuk van Oijen	7a21751750	filtering rustls (except errors) from logs	2023-11-28 10:55:01 +01:00
Luuk van Oijen	e68582871d	Revert "adding vid to the vehicle spawn data" This reverts commit `3df71e96c5`.	2023-11-27 16:57:04 +01:00
Luuk van Oijen	3df71e96c5	adding vid to the vehicle spawn data	2023-11-27 12:39:15 +01:00
Luuk van Oijen	6a1baa249a	wip more lua stuff (events + cleanup/util)	2023-11-26 00:22:28 +01:00
Luuk van Oijen	56cd0eca11	project cleanup, getplayeridentifiers and sendchatmessage implemented also adds support for the debug flag :)	2023-11-25 19:10:19 +01:00
Luuk van Oijen	04e058dc0d	Merge branch 'master' of https://github.com/Lucky4Luuk/beammp_rust_server	2023-11-24 16:05:23 +01:00
Luuk van Oijen	f359c0cdca	lua chat message stuff	2023-11-24 16:05:21 +01:00
Luuk van Oijen	9a45efef57	Merge pull request #13 from lionkor/add-ci Create rust.yml to build + test on push and PR	2023-11-24 14:47:17 +01:00
Luuk van Oijen	b06d2fe151	say command + playerlist works now	2023-11-24 14:37:07 +01:00
Luuk van Oijen	145b74aefc	Merge pull request #12 from lionkor/overhaul-resources-folder-code Overhaul resources folder code	2023-11-24 09:44:11 +01:00
Luuk van Oijen	1515fc2675	small cleanup	2023-11-24 09:43:13 +01:00
Lion Kortlepel	0f802e4021	fix typo in expect() string	2023-11-23 17:53:28 +01:00
Lion	213c1c7b6b	create rust.yml to build + test on push and PR	2023-11-23 17:47:33 +01:00
Lion Kortlepel	787f59ba46	fix server and client resource behavior, canonicalize paths in mod requests	2023-11-23 17:42:10 +01:00
Lion Kortlepel	72bec02e21	add fs_util module with a few useful functions for file/path management	2023-11-23 17:41:42 +01:00
Luuk van Oijen	46e42b88da	Merge branch 'master' of https://github.com/Lucky4Luuk/beammp_rust_server	2023-11-23 16:03:44 +01:00
Luuk van Oijen	39028ba4d7	small improvements + players cmd + cleanup	2023-11-23 16:03:31 +01:00
Luuk van Oijen	9cd4609cad	Merge pull request #11 from lionkor/fix-uuid-check Simplify UUID check	2023-11-23 16:00:52 +01:00
Lion Kortlepel	3b61da9edd	replace hand-written uuid check with Uuid::parse_str	2023-11-23 15:57:50 +01:00
Lion Kortlepel	09c4bb8b33	add uuid package to validate uuids for the AuthKey	2023-11-23 15:57:32 +01:00
Luuk van Oijen	f0a5fa48b8	Update mod.rs	2023-11-23 11:00:15 +01:00
Luuk van Oijen	cfea87251b	cleanup	2023-11-23 10:59:47 +01:00
Luuk van Oijen	04c1b76402	bunch of changes to prevent deadlocking the server	2023-11-23 10:56:51 +01:00
Luuk van Oijen	e15833084a	fixed another crash	2023-11-23 10:00:59 +01:00
Luuk van Oijen	13207a8ddf	Merge branch 'master' of https://github.com/Lucky4Luuk/beammp_rust_server	2023-11-23 09:47:08 +01:00
Luuk van Oijen	d5aef2525f	small cleanup	2023-11-23 09:47:01 +01:00
Luuk van Oijen	efbd2a4bb8	Merge pull request #9 from OfficialLambdax/welcome/leave-notification Welcome on full sync- and Leave on disconnect messages	2023-11-23 09:46:51 +01:00
Lambdax	478bf48a5a	to broadcast	2023-11-23 09:44:49 +01:00
Luuk van Oijen	1e7cccd9a9	Merge pull request #10 from OfficialLambdax/id-assign-replica Replicates the player id assigning from the c++ server	2023-11-23 09:41:03 +01:00
Lambdax	5fdfc10f79	assign ids	2023-11-23 09:14:46 +01:00
Lambdax	7eaa382f6c	Merge branch 'Lucky4Luuk:master' into welcome/leave-notification	2023-11-22 20:09:38 +01:00
Luuk van Oijen	b66251d375	fixed a crash	2023-11-22 19:47:58 +01:00
Lambdax	e6f316a6c2	Merge branch 'Lucky4Luuk:master' into welcome/leave-notification	2023-11-22 14:54:45 +01:00
Luuk van Oijen	49a8e84161	Update mod.rs	2023-11-22 14:46:31 +01:00
Lambdax	3376eb7482	formatting	2023-11-22 14:05:06 +01:00
Lambdax	de398c0208	welcome & leave	2023-11-22 14:02:23 +01:00
Luuk van Oijen	cde157fdfe	wip reusing of ids	2023-11-22 13:04:56 +01:00
Luuk van Oijen	3b0da388fb	removing a dependency on openssl	2023-11-22 12:44:17 +01:00
Luuk van Oijen	ad49713e13	replaced const with cli argument	2023-11-22 12:36:45 +01:00
Luuk van Oijen	191264e732	fixed crash	2023-11-22 12:24:58 +01:00
Luuk van Oijen	88181cf44c	Update mod.rs	2023-11-22 12:19:04 +01:00
Luuk van Oijen	03ea9513b9	wip improved return system thingy	2023-11-22 11:14:11 +01:00
Luuk van Oijen	6ed714b863	closing tui no longer crashes + onShutdown event	2023-11-22 11:02:53 +01:00
Luuk van Oijen	669e061fdf	Merge pull request #8 from OfficialLambdax/mod-request-check Mod request check + ui toggle	2023-11-22 10:23:32 +01:00
Lambdax	9b78fc76db	request check + ui toggle	2023-11-22 09:54:49 +01:00
Luuk van Oijen	dfcf820824	Merge pull request #7 from OfficialLambdax/auth_key-check Aborts heartbeat if the configured auth_key is invalid	2023-11-22 08:55:37 +01:00
Lambdax	259f3de774	key check	2023-11-22 08:36:17 +01:00
Luuk van Oijen	d9e0761e07	wip new console	2023-11-21 17:24:14 +01:00
Luuk van Oijen	67cec26979	Update main.rs	2023-11-21 10:01:54 +01:00
Luuk van Oijen	260fd03a1f	small fixes by neverless <3	2023-11-21 10:01:13 +01:00
Luuk van Oijen	2323c07d8e	Update main.rs	2023-11-20 18:30:46 +01:00
Luuk van Oijen	a61554187e	cpu usage finally fixed	2023-11-20 18:30:17 +01:00
Luuk van Oijen	6c2b131d72	kinda works + fixes a crash	2023-11-20 17:02:50 +01:00
Luuk van Oijen	5a42fe87fd	wip racing read_tcp and read_udp	2023-11-20 14:49:56 +01:00
Luuk van Oijen	4551a2da60	cleanup	2023-11-20 14:20:12 +01:00
Luuk van Oijen	223c9a5064	cleanup	2023-11-20 13:59:19 +01:00
Luuk van Oijen	5097244c76	heartbeat fixes + guest support	2023-11-20 13:33:07 +01:00
Luuk van Oijen	4e985bc0e0	logging chat	2023-11-20 13:08:04 +01:00
Luuk van Oijen	7d0941dee8	now it updates whenever new data is ready	2023-11-20 12:53:37 +01:00
Luuk van Oijen	0e75a35c83	wip updating of server status	2023-11-20 10:55:31 +01:00
Luuk van Oijen	7598261aff	force ipv4?	2023-11-20 10:11:24 +01:00
Luuk van Oijen	8280b06253	small cleanup	2023-11-20 09:47:35 +01:00
Luuk van Oijen	81816da44d	heartbeat technically works but needs lots of work	2023-11-20 09:40:16 +01:00
Luuk van Oijen	7c82f474bb	wip heartbeat stuff	2023-11-20 09:34:00 +01:00
Luuk van Oijen	4bf4727cc3	wip heartbeat stuff	2023-11-19 22:07:16 +01:00
Luuk van Oijen	0335d22809	wip player identifiers stuff	2023-11-17 14:29:19 +01:00
Luuk van Oijen	0f5d61c89b	improvements to many aspects of plugins	2023-11-16 19:47:08 +01:00
Luuk van Oijen	37d7a289eb	mod downloads are finally working	2023-11-16 10:42:59 +01:00
Luuk van Oijen	596a7234ed	man the download protocol sucks	2023-11-15 21:25:57 +01:00
Luuk van Oijen	8735824495	start of http stuff	2023-11-15 13:38:07 +01:00
Luuk van Oijen	51c5ee0638	whoops small oversight	2023-11-14 21:57:49 +01:00
Luuk van Oijen	4f57680a67	more lua stuff working now + cleanup client code	2023-11-14 14:06:05 +01:00
Luuk van Oijen	1c21298351	more work on the lua stuff	2023-11-14 09:53:46 +01:00
Luuk van Oijen	e781bbac8e	fixed the event handler registration stuff	2023-11-13 16:57:45 +01:00
Luuk van Oijen	a0db8aa8be	more steps towards reducing cpu load	2023-11-13 16:37:53 +01:00
Luuk van Oijen	f2b9384447	first step towards less cpu usage	2023-11-13 12:33:15 +01:00
Luuk van Oijen	b5c6f2c3c7	Update backend_lua.rs	2023-11-12 23:03:59 +01:00
Luuk van Oijen	6dee028a88	Update backend_lua.rs	2023-11-12 22:20:59 +01:00
Luuk van Oijen	4f52e30545	wip lua event stuff	2023-11-12 21:26:23 +01:00
Luuk van Oijen	01fb538129	now its just MP.function instead of MP:function	2023-11-12 16:35:15 +01:00
Luuk van Oijen	a23b5a43c0	more lua api stuff	2023-11-12 16:29:22 +01:00
Luuk van Oijen	8ee6ba16f2	very early version of plugin system	2023-11-12 15:31:15 +01:00
Luuk van Oijen	0b6ad43fbb	wip small stuff	2023-11-11 00:02:25 +01:00
Luuk van Oijen	5d8c9cd792	interval introduced to avoid massive cpu usage	2023-11-10 10:04:56 +01:00
Luuk van Oijen	c5ce152a30	license?	2023-11-09 23:27:39 +01:00
Luuk van Oijen	6c60f220eb	comments + todo	2023-11-09 15:53:29 +01:00
Luuk van Oijen	ff5a5204c9	bit of cleanup of unused old code	2023-11-09 14:54:45 +01:00
Luuk van Oijen	ad85317f60	mod download now gets halfway	2023-11-09 14:15:33 +01:00
Luuk van Oijen	efad9ec03e	implemented the playerlist and player count	2023-11-09 10:57:34 +01:00
Luuk van Oijen	5011ae280c	wip downloading (it doesnt work)	2023-11-08 21:35:13 +01:00
Luuk van Oijen	ebc0dba4ef	syncing cars when joining works now	2023-11-08 17:00:48 +01:00
Luuk van Oijen	ad15846625	wip syncing of vehicles when joining	2023-11-08 13:26:10 +01:00
Luuk van Oijen	e1b9f2b969	clients joining should no longer block acception runtime	2023-11-08 12:52:34 +01:00
Luuk van Oijen	3fedcf5bd5	Update mod.rs	2023-11-08 12:04:59 +01:00
Luuk van Oijen	190cc8f238	Update mod.rs	2023-11-08 11:47:23 +01:00
Luuk van Oijen	38aaf29fe8	initial commit	2023-11-07 22:48:41 +01:00