fix typos and phrasing in README.md

Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>
remove unecessary comment
2026-02-16 18:50:44 +00:00 · 2024-01-19 14:14:09 +01:00 · 2024-01-19 14:10:14 +01:00 · 2024-01-19 14:09:56 +01:00 · 2024-01-19 14:09:09 +01:00 · 2024-01-19 12:42:51 +01:00
54 changed files with 664 additions and 556 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,7 +1,6 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: "[Bug] Enter issue title here"
 labels: bug
 assignees: ''

--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,8 +1,7 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-title: "[Feature Request]"
-labels: enhancement
+labels: feature
 assignees: ''

 ---
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -2,15 +2,33 @@ name: Linux

 on: [push]

+
 env: 
  VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
+  VCPKG_FORCE_SYSTEM_BINARIES: 1
+  CMAKE_BUILD_TYPE: "Release"
+  DEBIAN_FRONTEND: "noninteractive"

 jobs:
-  debian-11-build:
-    runs-on: ubuntu-latest
+  x86_64-matrix:
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        include:
+          - distro: debian
+            version: 11
+          - distro: debian
+            version: 12
+          - distro: ubuntu
+            version: 22.04
+          - distro: ubuntu
+            version: 20.04
    container:
-      image: debian:11
+      image: ${{ matrix.distro }}:${{ matrix.version }}
    steps:
+      - name: get-cmake
+        uses: lukka/get-cmake@v3.28.1
+            
      - name: Export GitHub Actions cache environment variables
        uses: actions/github-script@v6
        with:
@@ -29,37 +47,59 @@ jobs:

      - name: Git config safe directory
        shell: bash
-        run: bash ./scripts/debian-11/1.5-git-safe.sh
+        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/1.5-git-safe.sh

      - name: Install Dependencies
-        run: bash ./scripts/debian-11/1-install-deps.sh
+        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/1-install-deps.sh

      - name: Create Build Environment
-        run: bash ./scripts/debian-11/2-configure.sh '-DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake'
+        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/2-configure.sh '-DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake'

      - name: Build Server
-        run: bash ./scripts/debian-11/3-build.sh
+        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build.sh

      - name: Archive server artifact
        uses: actions/upload-artifact@v2
        with:
-          name: BeamMP-Server-debian
+          name: BeamMP-Server.${{ matrix.distro }}.${{ matrix.version }}.x86_64
          path: ./bin/BeamMP-Server

-      - name: Build Tests
-        run: bash ./scripts/debian-11/3-build-tests.sh
-
-      - name: Archive server tests artifact
+      - name: Archive server debug info artifact
        uses: actions/upload-artifact@v2
        with:
-          name: BeamMP-Server-debian-tests
-          path: ./bin/BeamMP-Server-tests
+          name: debuginfo.${{ matrix.distro }}.${{ matrix.version }}.x86_64
+          path: ./bin/BeamMP-Server.debug

-  ubuntu-22-04-build:
-    runs-on: ubuntu-latest
+      - name: Build Tests
+        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build-tests.sh
+
+      - name: Install Runtime Dependencies
+        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/4-install-runtime-deps.sh
+
+      - name: Test
+        run: ./bin/BeamMP-Server-tests
+
+  arm64-matrix:
+    runs-on: [Linux, ARM64]
+    env:
+      VCPKG_DEFAULT_TRIPLET: "arm64-linux"
+    strategy:
+      matrix:
+        include:
+          - distro: debian
+            version: 11
+          - distro: debian
+            version: 12
+          - distro: ubuntu
+            version: 22.04
+          - distro: ubuntu
+            version: 20.04
    container:
-      image: ubuntu:22.04
+      image: ${{ matrix.distro }}:${{ matrix.version }}
    steps:
+      - name: get-cmake
+        uses: lukka/get-cmake@v3.28.1
+            
      - name: Export GitHub Actions cache environment variables
        uses: actions/github-script@v6
        with:
@@ -78,73 +118,35 @@ jobs:

      - name: Git config safe directory
        shell: bash
-        run: bash ./scripts/ubuntu-22.04/1.5-git-safe.sh
+        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/1.5-git-safe.sh

      - name: Install Dependencies
-        run: bash ./scripts/ubuntu-22.04/1-install-deps.sh
-
-      - name: Setup vcpkg
-        uses: lukka/run-vcpkg@v11
-        with:
-          runVcpkgInstall: true
+        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/1-install-deps.sh

      - name: Create Build Environment
-        run: bash ./scripts/ubuntu-22.04/2-configure.sh '-DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake'
+        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/2-configure.sh '-DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake'

      - name: Build Server
-        run: bash ./scripts/ubuntu-22.04/3-build.sh
+        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build.sh

      - name: Archive server artifact
        uses: actions/upload-artifact@v2
        with:
-          name: BeamMP-Server-ubuntu
+          name: BeamMP-Server.${{ matrix.distro }}.${{ matrix.version }}.arm64
          path: ./bin/BeamMP-Server
-      
-      - name: Build Tests
-        run: bash ./scripts/ubuntu-22.04/3-build-tests.sh

-      - name: Archive server tests artifact
+      - name: Archive server debug info artifact
        uses: actions/upload-artifact@v2
        with:
-          name: BeamMP-Server-ubuntu-tests
-          path: ./bin/BeamMP-Server-tests
+          name: debuginfo.${{ matrix.distro }}.${{ matrix.version }}.arm64
+          path: ./bin/BeamMP-Server.debug
+
+      - name: Build Tests
+        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build-tests.sh

-  run-debian-11-tests:
-    needs: debian-11-build
-    runs-on: ubuntu-latest
-    container:
-      image: debian:11
-    steps:
-      - uses: actions/download-artifact@master
-        with:
-          name: BeamMP-Server-debian-tests
-    
      - name: Install Runtime Dependencies
-        run: |
-          apt-get update -y
-          apt-get install -y liblua5.3-0
+        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/4-install-runtime-deps.sh

      - name: Test
-        run: |
-            chmod +x ./BeamMP-Server-tests
-            ./BeamMP-Server-tests
+        run: ./bin/BeamMP-Server-tests

-  run-ubuntu-22-04-tests:
-    needs: ubuntu-22-04-build
-    runs-on: ubuntu-latest
-    container:
-      image: ubuntu:22.04
-    steps:
-      - uses: actions/download-artifact@master
-        with:
-          name: BeamMP-Server-ubuntu-tests
-    
-      - name: Install Runtime Dependencies
-        run: |
-          apt-get update -y
-          apt-get install -y liblua5.3-0
-
-      - name: Test
-        run: |
-            chmod +x ./BeamMP-Server-tests
-            ./BeamMP-Server-tests
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,6 +7,8 @@ on:

 env:
  VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
+  CMAKE_BUILD_TYPE: "Release"
+  DEBIAN_FRONTEND: "noninteractive"

 jobs:
  create-release:
@@ -26,18 +28,30 @@ jobs:
          draft: false
          prerelease: true
          body: |
-              Files included in this release:
-              - `BeamMP-Server.exe` is the windows build.
-              - `BeamMP-Server-debian` is a Debian 11 build, requires `liblua5.3-0`.
-              - `BeamMP-Server-ubuntu` is a Ubuntu 22.04 build, requires `liblua5.3-0`.
+            Files included in this release are:
+            - `BeamMP-Server.$DISTRO.$DISTROVERSION.$ARCH` for linux builds, for example `BeamMP-Server.debian.11.x86_64` for the Debian 11 build for x86_64. All require `liblua5.3` to be installed.
+            - `BeamMP-Server.exe` for the Windows build (x86_64). You need to install the [Visual C++ Redistributables](https://aka.ms/vs/17/release/vc_redist.x64.exe) to run this.

-  upload-release-files-debian-11:
-    name: Build and upload Debian 11 Release Files
+  x86_64-matrix:
    runs-on: ubuntu-22.04
    needs: create-release
+    strategy:
+      matrix:
+        include:
+          - distro: debian
+            version: 11
+          - distro: debian
+            version: 12
+          - distro: ubuntu
+            version: 22.04
+          - distro: ubuntu
+            version: 20.04
    container:
-      image: debian:11
+      image: ${{ matrix.distro }}:${{ matrix.version }}
    steps:
+      - name: get-cmake
+        uses: lukka/get-cmake@v3.28.1
+            
      - name: Export GitHub Actions cache environment variables
        uses: actions/github-script@v6
        with:
@@ -56,21 +70,16 @@ jobs:

      - name: Git config safe directory
        shell: bash
-        run: bash ./scripts/debian-11/1.5-git-safe.sh
+        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/1.5-git-safe.sh

      - name: Install Dependencies
-        run: bash ./scripts/debian-11/1-install-deps.sh
-
-      - name: Setup vcpkg
-        uses: lukka/run-vcpkg@v11
-        with:
-          runVcpkgInstall: true
+        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/1-install-deps.sh

      - name: Create Build Environment
-        run: bash ./scripts/debian-11/2-configure.sh '-DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake'
+        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/2-configure.sh '-DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake'

      - name: Build Server
-        run: bash ./scripts/debian-11/3-build.sh
+        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build.sh

      - name: Upload Release Asset
        id: upload-release-asset 
@@ -78,18 +87,45 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
+          asset_name: BeamMP-Server.${{ matrix.distro }}.${{ matrix.version }}.x86_64
          upload_url: ${{ needs.create-release.outputs.upload_url }}
          asset_path: ./bin/BeamMP-Server
-          asset_name: BeamMP-Server-debian
          asset_content_type: application/x-elf
-    
-  upload-release-files-ubuntu-22-04:
-    name: Build and upload Ubuntu 22.04 Release Files
-    runs-on: ubuntu-22.04
+
+      - name: Upload Debug Info
+        id: upload-debug-info
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          asset_name: debuginfo.${{ matrix.distro }}.${{ matrix.version }}.x86_64
+          upload_url: ${{ needs.create-release.outputs.upload_url }}
+          asset_path: ./bin/BeamMP-Server.debug
+          asset_content_type: application/x-elf
+
+  arm64-matrix:
+    runs-on: [Linux, ARM64]
    needs: create-release
+    strategy:
+      matrix:
+        include:
+          - distro: debian
+            version: 11
+          - distro: debian
+            version: 12
+          - distro: ubuntu
+            version: 22.04
+          - distro: ubuntu
+            version: 20.04
+    env:
+      VCPKG_DEFAULT_TRIPLET: "arm64-linux"
+      VCPKG_FORCE_SYSTEM_BINARIES: 1
    container:
-      image: ubuntu:22.04
+      image: ${{ matrix.distro }}:${{ matrix.version }}
    steps:
+      - name: get-cmake
+        uses: lukka/get-cmake@v3.28.1
+            
      - name: Export GitHub Actions cache environment variables
        uses: actions/github-script@v6
        with:
@@ -108,21 +144,16 @@ jobs:

      - name: Git config safe directory
        shell: bash
-        run: bash ./scripts/ubuntu-22.04/1.5-git-safe.sh
+        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/1.5-git-safe.sh

      - name: Install Dependencies
-        run: bash ./scripts/ubuntu-22.04/1-install-deps.sh
-
-      - name: Setup vcpkg
-        uses: lukka/run-vcpkg@v11
-        with:
-          runVcpkgInstall: true
+        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/1-install-deps.sh

      - name: Create Build Environment
-        run: bash ./scripts/ubuntu-22.04/2-configure.sh '-DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake'
+        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/2-configure.sh '-DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake'

      - name: Build Server
-        run: bash ./scripts/ubuntu-22.04/3-build.sh
+        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build.sh

      - name: Upload Release Asset
        id: upload-release-asset 
@@ -130,13 +161,24 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
+          asset_name: BeamMP-Server.${{ matrix.distro }}.${{ matrix.version }}.arm64
          upload_url: ${{ needs.create-release.outputs.upload_url }}
          asset_path: ./bin/BeamMP-Server
-          asset_name: BeamMP-Server-ubuntu
+          asset_content_type: application/x-elf
+
+      - name: Upload Debug Info
+        id: upload-debug-info
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          asset_name: debuginfo.${{ matrix.distro }}.${{ matrix.version }}.arm64
+          upload_url: ${{ needs.create-release.outputs.upload_url }}
+          asset_path: ./bin/BeamMP-Server.debug
          asset_content_type: application/x-elf

  upload-release-files-windows:
-    name: Upload Windows Release Files
+    name: Build and upload Windows Release Files
    runs-on: windows-latest
    needs: create-release
    env:
@@ -153,11 +195,6 @@ jobs:
        with:
          submodules: 'recursive'

-      - name: Setup vcpkg
-        uses: lukka/run-vcpkg@v11
-        with:
-          runVcpkgInstall: true
-
      - name: Create Build Environment
        shell: bash
        run: ./scripts/windows/1-configure.sh
@@ -175,4 +212,4 @@ jobs:
          upload_url: ${{ needs.create-release.outputs.upload_url }}
          asset_path: ./bin/Release/BeamMP-Server.exe
          asset_name: BeamMP-Server.exe
-          asset_content_type: application/vnd.microsoft.portable-executable
+          asset_content_type: application/vnd.microsoft.portable-executable
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -5,6 +5,7 @@ on: [push]
 env:
  VCPKG_DEFAULT_TRIPLET: x64-windows-static
  VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
+  CMAKE_BUILD_TYPE: "Release"

 jobs:
  windows-build:
@@ -38,5 +39,5 @@ jobs:
        uses: actions/upload-artifact@v2
        with:
          name: BeamMP-Server-windows
-          path: ./bin/BeamMP-Server.exe
+          path: ./bin/Release/BeamMP-Server.exe

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,6 +48,7 @@ set(PRJ_HEADERS
    include/TScopedTimer.h
    include/TServer.h
    include/VehicleData.h
+    include/Env.h
 )
 # add all source files (.cpp) to this, except the one with main()
 set(PRJ_SOURCES
@@ -70,6 +71,7 @@ set(PRJ_SOURCES
    src/TScopedTimer.cpp
    src/TServer.cpp
    src/VehicleData.cpp
+    src/Env.cpp
 )

 find_package(Lua REQUIRED)
@@ -126,9 +128,10 @@ include(FindThreads)
 # enables compile_commands.json for clang-related tools (such as the clang LS)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

-# build debug builds by default (if not specified otherwise)
-if(NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE "Debug")
+# build release builds by default (if not specified otherwise)
+if(NOT DEFINED CMAKE_BUILD_TYPE)
+    message(NOTICE "No build type specified, defaulting to 'Release'")
+    set(CMAKE_BUILD_TYPE "Release")
 endif()

 if(UNIX)
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,156 +0,0 @@
-# v3.1.1
-
- FIXED bug which caused GetPlayerIdentifiers, GetPlayerName, etc not to work in `onPlayerDisconnect`
- FIXED some issues which could cause the server to crash when receiving malformed data
- FIXED a bug which caused a server to crash during authentication when receiving malformed data
- FIXED minor vulnerability in chat message handling
- FIXED a minor formatting bug in the `status` command
-
-# v3.1.0
-
- ADDED Tab autocomplete in console, smart tab autocomplete (understands lua tables and types) in the lua console
- ADDED lua debug facilities (type `:help` when attached to lua via `lua`)
- ADDED Util.JsonEncode() and Util.JsonDecode(), which turn lua tables into json and vice-versa
- ADDED FS.ListFiles and FS.ListDirectories
- ADDED onFileChanged event, triggered when a server plugin file changes
- ADDED MP.GetPositionRaw(), which can be used to retrieve the latest position packet per player, per vehicle
- ADDED error messages to some lua functions
- ADDED HOME and END button working in console
- ADDED `MP.TriggerClientEventJson()` which takes a table as the data argument and sends it as JSON
- ADDED identifiers (beammp id, ip) to onPlayerAuth (4th argument)
- ADDED more network debug logging
- CHANGED all networking to be more stable, performant, and safe
- FIXED `ip` in MP.GetPlayerIdentifiers
- FIXED issue with client->server events which contain `:`
- FIXED a fatal exception on LuaEngine startup if Resources/Server is a symlink
- FIXED onInit not being called on hot-reload
- FIXED incorrect timing calculation of Lua EventTimer loop
- FIXED bug which caused hot-reload not to report syntax errors
- FIXED missing error messages on some event handler calls
- FIXED vehicles not deleting for all players if an edit was cancelled by Lua
- FIXED server not handling binary UDP packets properly
- REMOVED "Backend response failed to parse as valid json" message
-
-# v3.0.2
-
- ADDED Periodic update message if a new server is released
- ADDED Config setting for the IP the http server listens on
- CHANGED Default MaxPlayers to 8
- CHANGED Default http server listen IP to localhost
- FIXED `MP.CreateEventTimer` filling up the queue (see <https://wiki.beammp.com/en/Scripting/new-lua-scripting#mpcreateeventtimerevent_name-string-interval_ms-number-strategy-number-since-v302>)
- FIXED `MP.TriggerClientEvent` not kicking the client if it failed
- FIXED Lua result queue handling not checking all results
- FIXED bug which caused ServerConfig.toml to generate incorrectly
-
-# v3.0.1
-
- ADDED Backup URLs to UpdateCheck (will fail less often now)
- ADDED console cursor left and right movement (with arrow keys) and working HOME and END key (via github.com/lionkor/commandline)
- FIXED infinite snowmen / infinite unicycle spawning bug
- FIXED a bug where, when run with --working-directory, the Server.log would still be in the original directory
- FIXED a bug which could cause the plugin reload thread to spin at 100% if the reloaded plugin's didn't terminate
- FIXED an issue which would cause servers to crash on mod download via SIGPIPE on POSIX
- FIXED an issue which would cause servers to crash when checking if a vehicle is a unicycle
-
-# v3.0.0
-
- CHANGED entire plugin Lua implementation (rewrite)
- CHANGED moved *almost all* Lua functions into MP.\*
- CHANGED console to use a custom language (type `help`, `list`, or `status`!)
- CHANGED all files of a Lua plugin to share a Lua state (no more state-per-file)
- ADDED many new Lua API functions, which can be found at <https://wiki.beammp.com/en/Scripting/functions>
- ADDED Commandline options. Run with `--help` to see all options.
- ADDED HTTP(S) Server (OpenAPI spec coming soon!)
- ADDED plugin directories to `package.path` and `package.cpath` before `onInit`
- ADDED ability to add `PluginConfig.toml` to your plugin folder to change some settings
- ADDED ability to share a lua state with other plugins via `StateId` setting in `PluginConfig.toml`
- ADDED ability to see name-to-thread-ID association in debug mode
- ADDED dumping tables with `print()` (try it with `print(MP)`)
- ADDED `MP.GetOSName()`, `MP.CreateTimer()`, `MP.GetLuaMemoryUsage()` and many more (see <https://wiki.beammp.com/en/Scripting/functions>)
- ADDED `MP.Settings` table to make usage of `MP.Set()` easier
- ADDED `FS.*` table with common filesystem operations (do `print(FS)` to see them!)
- FIXED i/o thread spin when stdout is /dev/null on linux
- FIXED removed extra whitespace infront of onChatMessage message
-
-# v2.3.3
-
- CHANGED servers to be private by default
-
-# v2.3.2
-
- ADDED Ctrl+C causes a graceful shutdown on windows (did already on linux)
- ADDED more meaningful shutdown messages
- ADDED even better backend connection error reporting
- ADDED `SendErrors` config in `ServerConfig.toml` to opt-out of error reporting
- ADDED hard-shutdown if Ctrl+C pressed 3 times
- FIXED issue with shells like bash being unusable after server exit
-
-# v2.3.1
-
- CHANGED join/sync timeout to 20 minutes, players wont drop if loading takes >5 mins
-
-# v2.3.0
-
- ADDED version check - the server will now let you know when a new release is out
- ADDED logging of various errors, crashes and exceptions to the backend
- ADDED chat messages are now logged to the server console as [CHAT]
- ADDED debug message telling you when the server heartbeats to the backend
- REMOVED various [DEBUG] messages which were confusing (such as "breaking client loop")
- FIXED various crashes and issues with handling unexpected backend responses
- FIXED minor bugs due to code correctness
-
-# v2.2.0
-
- FIXED major security flaw
- FIXED minor bugs
-
-# v2.1.4
-
- ADDED debug heartbeat print
- ADDED kicking every player before shutdown
- FIXED rare bug which led to violent crash
- FIXED minor bugs
-
-# v2.1.3
-
- FIXED Lua events not cancelling properly on Linux
-
-# v2.1.2
-
- CHANGED default map to gridmap v2
- FIXED version number display
-
-# v2.1.1
-# v2.1.0 (pre-v2.1.1)
-# v2.0.4 (pre-v2.1.0)
-
- REMOVED boost as a runtime dependency
- FIXED Lua plugins on Linux
- FIXED console history on Windows
- CHANGED to new config format TOML
-
-# v2.0.3
-
- WORKAROUND for timeout bug / ghost player bug
- FIXED 100% CPU spin when stdin is /dev/null.
-
-# v2.0.2
-
- ADDED fully new commandline
- ADDED new backend
- ADDED automated build system
- ADDED lua GetPlayerIdentifiers
- ADDED lots of debug info
- ADDED better POSTing and GETing
- ADDED a license
- FIXED ghost players in player list issue
- FIXED ghost vehicle after joining issue
- FIXED missing vehicle after joining issue
- FIXED a lot of desync issues
- FIXED some memory leaks
- FIXED various crashes
- FIXED various data-races
- FIXED some linux-specific crashes
- FIXED some linux-specific issues
- FIXED bug which caused kicking to be logged as leaving
- FIXED various internal developer quality-of-life things
--- a/README.md
+++ b/README.md
@@ -6,13 +6,12 @@
 This is the server for the multiplayer mod **[BeamMP](https://beammp.com/)** for the game [BeamNG.drive](https://www.beamng.com/).
 The server is the point through which all clients communicate. You can write Lua mods for the server, there are detailed instructions on the [BeamMP Wiki](https://wiki.beammp.com).

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

 ## Support + Contact

 Feel free to ask any questions via the following channels:

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

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

 ## Supported Operating Systems

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

 Recommended compilers: MSVC, GCC, CLANG. 

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

 ## Build Instructions

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

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

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

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

-##### Runtime Dependencies
+If you are building for ARM (like aarch64), you need to run `export VCPKG_FORCE_SYSTEM_BINARIES=1` before the following commands.
+
+You can build on **Windows, Linux** or other platforms by following these steps:
+
+1. Check out the repository with git: `git clone --recursive https://github.com/BeamMP/BeamMP-Server`.
+2. Go into the directory `cd BeamMP-Server`.
+3. Run CMake `cmake -S . -B bin -DCMAKE_BUILD_TYPE=Release` - this can take a few minutes and may take a lot of disk space and bandwidth.
+4. Build via `cmake --build bin --parallel --config Release -t BeamMP-Server`.
+5. Your executable can be found in `bin/`.
+
+When you make changes to the code, you only have to run step 4 again.
+### Building for FreeBSD
+Building is only supported for major release branches of FreeBSD that are currently not EOL. The build process is the same as on Linux, although build dependencies can be universally installed from ports via pkg:
+```
+pkg install git cmake-core zip bash devel/ninja devel/pkgconf lua53
+```
+After installing the necessary build dependencies, follow the Linux build instructions beginning from step 3. Beware that running the initial cmake command will compile vcpkg from source, as vcpkg has no native FreeBSD port - this may take some time.
+
+On systems with a single logical CPU core, `make` may fail to build the server when using the `--parallel` option when calling CMake. If you see error messages related to make, simply omit the `--parallel` from the command: `cmake --build bin --config Release -t BeamMP-Server`.
+
+### Runtime Dependencies

 These are needed to *run* the server.

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

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

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

 ## Support
 The BeamMP project is supported by community donations via our [Patreon](https://www.patreon.com/BeamMP). This brings perks such as Patreon-only channels on our Discord, early access to new updates, and more server keys. 
--- a/deps/commandline
+++ b/deps/commandline
--- a/include/Common.h
+++ b/include/Common.h
@@ -43,9 +43,11 @@ public:
    struct TSettings {
        std::string ServerName { "BeamMP Server" };
        std::string ServerDesc { "BeamMP Default Description" };
+        std::string ServerTags { "Freeroam" };
        std::string Resource { "Resources" };
        std::string MapName { "/levels/gridmap_v2/info.json" };
        std::string Key {};
+        std::string Password{};
        std::string SSLKeyPath { "./.ssl/HttpServer/key.pem" };
        std::string SSLCertPath { "./.ssl/HttpServer/cert.pem" };
        bool HTTPServerEnabled { false };
@@ -74,7 +76,7 @@ public:
    static void RegisterShutdownHandler(const TShutdownHandler& Handler);
    // Causes all threads to finish up and exit gracefull gracefully
    static void GracefullyShutdown();
-    static TConsole& Console() { return *mConsole; }
+    static TConsole& Console() { return mConsole; }
    static std::string ServerVersionString();
    static const Version& ServerVersion() { return mVersion; }
    static uint8_t ClientMajorVersion() { return 2; }
@@ -100,9 +102,7 @@ public:
    static void SleepSafeSeconds(size_t Seconds);

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

    enum class Status {
@@ -128,15 +128,17 @@ private:
    static inline SystemStatusMap mSystemStatusMap {};
    static inline std::mutex mSystemStatusMapMutex {};
    static inline std::string mPPS;
-    static inline std::unique_ptr<TConsole> mConsole;
+    static inline TConsole mConsole;
    static inline std::shared_mutex mShutdownMtx {};
    static inline bool mShutdown { false };
    static inline std::mutex mShutdownHandlersMutex {};
    static inline std::deque<TShutdownHandler> mShutdownHandlers {};

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

+void SplitString(std::string const& str, const char delim, std::vector<std::string>& out);
+
 std::string ThreadName(bool DebugModeOverride = false);
 void RegisterThread(const std::string& str);
 #define RegisterThreadAuto() RegisterThread(__func__)
--- a/include/Compat.h
+++ b/include/Compat.h
@@ -9,7 +9,17 @@
 #include <termios.h>
 #include <unistd.h>
 char _getch();
-#endif // unix
+#endif // linux
+
+#ifdef BEAMMP_FREEBSD
+#include <errno.h>
+#include <termios.h>
+#include <unistd.h>
+char _getch();
+// macros 'major' and 'minor' need to be undefined on FreeBSD to avoid naming collision with system headers
+#undef major
+#undef minor
+#endif // freebsd

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

--- a/include/Env.h
+++ b/include/Env.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include <optional>
+#include <string>
+namespace Env {
+
+enum class Key {
+    // provider settings
+    PROVIDER_UPDATE_MESSAGE,
+};
+
+std::optional<std::string> Get(Key key);
+
+std::string_view ToString(Key key);
+
+}
--- a/include/Environment.h
+++ b/include/Environment.h
@@ -3,11 +3,13 @@
 // one of BEAMMP_{WINDOWS,LINUX,APPLE} will be set at the end of this

 // clang-format off
-#if !defined(BEAMMP_WINDOWS) && !defined(BEAMMP_UNIX) && !defined(BEAMMP_APPLE)
+#if !defined(BEAMMP_WINDOWS) && !defined(BEAMMP_UNIX) && !defined(BEAMMP_APPLE) && !defined(BEAMMP_FREEBSD)
    #if defined(_WIN32) || defined(__CYGWIN__)
        #define BEAMMP_WINDOWS
-    #elif defined(__linux__) || defined(__linux) || defined(linux) || defined(__unix__) || defined(__unix) || defined(unix)
+    #elif defined(__linux__) || defined(__linux) || defined(linux)
        #define BEAMMP_LINUX
+    #elif defined(__FreeBSD__)
+	#define BEAMMP_FREEBSD
    #elif defined(__APPLE__) || defined(__MACH__)
        #define BEAMMP_APPLE
    #else
--- a/include/IThreaded.h
+++ b/include/IThreaded.h
@@ -8,7 +8,7 @@ public:
    IThreaded()
        // invokes operator() on this object
        : mThread() { }
-    ~IThreaded() noexcept {
+    virtual ~IThreaded() noexcept {
        if (mThread.joinable()) {
            mThread.join();
        }
--- a/include/TConfig.h
+++ b/include/TConfig.h
@@ -22,11 +22,12 @@ private:
    void CreateConfigFile();
    void ParseFromFile(std::string_view name);
    void PrintDebug();
-    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, 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 TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, std::string& OutValue);
+    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, bool& OutValue);
+    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, int& OutValue);

    void ParseOldFormat();
+    std::string TagsAsPrettyArray() const;
    bool IsDefault();
    bool mFailed { false };
    std::string mConfigFileName;
--- a/include/TConsole.h
+++ b/include/TConsole.h
@@ -17,12 +17,15 @@ class TConsole {
 public:
    TConsole();

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

 private:
    void RunAsCommand(const std::string& cmd, bool IgnoreNotACommand = false);
@@ -56,7 +59,7 @@ private:
        { "say", [this](const auto&, const auto&) { Command_Say(""); } }, // shouldn't actually be called
    };

-    Commandline mCommandline;
+    std::unique_ptr<Commandline> mCommandline { nullptr };
    std::vector<std::string> mCachedLuaHistory;
    std::vector<std::string> mCachedRegularHistory;
    TLuaEngine* mLuaEngine { nullptr };
--- a/include/TLuaEngine.h
+++ b/include/TLuaEngine.h
@@ -41,7 +41,14 @@ struct TLuaResult {
    sol::object Result { sol::lua_nil };
    TLuaStateId StateId;
    std::string Function;
-    // TODO: Add condition_variable
+    std::shared_ptr<std::mutex> ReadyMutex {
+        std::make_shared<std::mutex>()
+    };
+    std::shared_ptr<std::condition_variable> ReadyCondition {
+        std::make_shared<std::condition_variable>()
+    };
+
+    void MarkAsReady();
    void WaitUntilReady();
 };

@@ -98,8 +105,8 @@ public:
        return mLuaStates.size();
    }
    std::vector<std::string> GetLuaStateNames() {
-        std::vector<std::string> names{};
-        for(auto const& [stateId, _ ] : mLuaStates) {
+        std::vector<std::string> names {};
+        for (auto const& [stateId, _] : mLuaStates) {
            names.push_back(stateId);
        }
        return names;
--- a/include/TNetwork.h
+++ b/include/TNetwork.h
@@ -52,4 +52,5 @@ private:
    static const uint8_t* SendSplit(TClient& c, ip::tcp::socket& Socket, const uint8_t* DataPtr, size_t Size);
 };

+std::string HashPassword(const std::string& str);
 std::vector<uint8_t> StringToVector(const std::string& Str);
--- a/include/TPPSMonitor.h
+++ b/include/TPPSMonitor.h
@@ -9,6 +9,7 @@ class TNetwork;
 class TPPSMonitor : public IThreaded {
 public:
    explicit TPPSMonitor(TServer& Server);
+    virtual ~TPPSMonitor() {}

    void operator()() override;

--- a/include/TServer.h
+++ b/include/TServer.h
@@ -26,7 +26,7 @@ public:
    void ForEachClient(const std::function<bool(std::weak_ptr<TClient>)>& Fn);
    size_t ClientCount() const;

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

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

 struct BufferView {
--- a/scripts/debian-11/1-install-deps.sh
+++ b/scripts/debian-11/1-install-deps.sh
@@ -4,4 +4,4 @@ set -ex

 apt-get update -y

-apt-get install -y liblua5.3-0 liblua5.3-dev curl zip unzip tar cmake make git g++
+apt-get install -y liblua5.3-0 liblua5.3-dev curl zip unzip tar cmake make git g++ ninja-build
--- a/scripts/debian-11/2-configure.sh
+++ b/scripts/debian-11/2-configure.sh
@@ -2,4 +2,6 @@

 set -ex

-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -s -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,--build-id=none -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
+./vcpkg/bootstrap-vcpkg.sh
+
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
--- a/scripts/debian-11/3-build.sh
+++ b/scripts/debian-11/3-build.sh
@@ -3,3 +3,8 @@
 set -ex

 cmake --build bin --parallel -t BeamMP-Server
+
+objcopy --only-keep-debug bin/BeamMP-Server bin/BeamMP-Server.debug
+objcopy --add-gnu-debuglink bin/BeamMP-Server bin/BeamMP-Server.debug
+
+strip -s bin/BeamMP-Server
--- a/scripts/debian-12/1-install-deps.sh
+++ b/scripts/debian-12/1-install-deps.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+apt-get update -y
+
+apt-get install -y liblua5.3-0 liblua5.3-dev curl zip unzip tar cmake make git g++ ninja-build
--- a/scripts/debian-12/1.5-git-safe.sh
+++ b/scripts/debian-12/1.5-git-safe.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+git config --global --add safe.directory $(pwd)
+git config --global --add safe.directory $(pwd)/vcpkg
+git config --global --add safe.directory $(pwd)/deps/commandline
--- a/scripts/debian-12/2-configure.sh
+++ b/scripts/debian-12/2-configure.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+./vcpkg/bootstrap-vcpkg.sh
+
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
--- a/scripts/debian-12/3-build-tests.sh
+++ b/scripts/debian-12/3-build-tests.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -ex
+
+cmake --build bin --parallel -t BeamMP-Server-tests
--- a/scripts/debian-12/3-build.sh
+++ b/scripts/debian-12/3-build.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -ex
+
+cmake --build bin --parallel -t BeamMP-Server
+
+objcopy --only-keep-debug bin/BeamMP-Server bin/BeamMP-Server.debug
+objcopy --add-gnu-debuglink bin/BeamMP-Server bin/BeamMP-Server.debug
+
+strip -s bin/BeamMP-Server
--- a/scripts/debian-12/4-install-runtime-deps.sh
+++ b/scripts/debian-12/4-install-runtime-deps.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -ex
+
+apt-get update -y
+
+apt-get install -y liblua5.3-0 curl
+
--- a/scripts/ubuntu-20.04/1-install-deps.sh
+++ b/scripts/ubuntu-20.04/1-install-deps.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+apt-get update -y
+
+apt-get install -y liblua5.3-0 liblua5.3-dev curl zip unzip tar cmake make git g++ ninja-build
--- a/scripts/ubuntu-20.04/1.5-git-safe.sh
+++ b/scripts/ubuntu-20.04/1.5-git-safe.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+git config --global --add safe.directory $(pwd)
+git config --global --add safe.directory $(pwd)/vcpkg
+git config --global --add safe.directory $(pwd)/deps/commandline
--- a/scripts/ubuntu-20.04/2-configure.sh
+++ b/scripts/ubuntu-20.04/2-configure.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+./vcpkg/bootstrap-vcpkg.sh
+
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
--- a/scripts/ubuntu-20.04/3-build-tests.sh
+++ b/scripts/ubuntu-20.04/3-build-tests.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -ex
+
+cmake --build bin --parallel -t BeamMP-Server-tests
--- a/scripts/ubuntu-20.04/3-build.sh
+++ b/scripts/ubuntu-20.04/3-build.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -ex
+
+cmake --build bin --parallel -t BeamMP-Server
+
+objcopy --only-keep-debug bin/BeamMP-Server bin/BeamMP-Server.debug
+objcopy --add-gnu-debuglink bin/BeamMP-Server bin/BeamMP-Server.debug
+
+strip -s bin/BeamMP-Server
--- a/scripts/ubuntu-20.04/4-install-runtime-deps.sh
+++ b/scripts/ubuntu-20.04/4-install-runtime-deps.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -ex
+
+apt-get update -y
+
+apt-get install -y liblua5.3-0 curl
+
--- a/scripts/ubuntu-22.04/1-install-deps.sh
+++ b/scripts/ubuntu-22.04/1-install-deps.sh
@@ -4,4 +4,4 @@ set -ex

 apt-get update -y

-apt-get install -y liblua5.3-0 liblua5.3-dev curl zip unzip tar cmake make git g++
+apt-get install -y liblua5.3-0 liblua5.3-dev curl zip unzip tar cmake make git g++ ninja-build
--- a/scripts/ubuntu-22.04/2-configure.sh
+++ b/scripts/ubuntu-22.04/2-configure.sh
@@ -2,4 +2,6 @@

 set -ex

-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -s -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,--build-id=none -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
+./vcpkg/bootstrap-vcpkg.sh
+
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
--- a/scripts/ubuntu-22.04/3-build.sh
+++ b/scripts/ubuntu-22.04/3-build.sh
@@ -3,3 +3,8 @@
 set -ex

 cmake --build bin --parallel -t BeamMP-Server
+
+objcopy --only-keep-debug bin/BeamMP-Server bin/BeamMP-Server.debug
+objcopy --add-gnu-debuglink bin/BeamMP-Server bin/BeamMP-Server.debug
+
+strip -s bin/BeamMP-Server
--- a/scripts/windows/1-configure.sh
+++ b/scripts/windows/1-configure.sh
@@ -2,4 +2,6 @@

 set -ex

+vcpkg add port lua
+
 cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DBeamMP-Server_ENABLE_LTO=ON -DVCPKG_TARGET_TRIPLET=x64-windows-static
--- a/scripts/windows/2-build.sh
+++ b/scripts/windows/2-build.sh
@@ -2,4 +2,4 @@

 set -ex

-cmake --build bin --parallel -t BeamMP-Server
+cmake --build bin --parallel -t BeamMP-Server --config Release
--- a/src/Client.cpp
+++ b/src/Client.cpp
@@ -51,11 +51,11 @@ TClient::TVehicleDataLockPair TClient::GetAllCars() {
 std::string TClient::GetCarPositionRaw(int Ident) {
    std::unique_lock lock(mVehiclePositionMutex);
    try {
-        return mVehiclePosition.at(Ident);
+        return mVehiclePosition.at(size_t(Ident));
    } catch (const std::out_of_range& oor) {
+        beammp_debugf("Failed to get vehicle position for {}: {}", Ident, oor.what());
        return "";
    }
-    return "";
 }

 void TClient::Disconnect(std::string_view Reason) {
@@ -73,7 +73,7 @@ void TClient::Disconnect(std::string_view Reason) {

 void TClient::SetCarPosition(int Ident, const std::string& Data) {
    std::unique_lock lock(mVehiclePositionMutex);
-    mVehiclePosition[Ident] = Data;
+    mVehiclePosition[size_t(Ident)] = Data;
 }

 std::string TClient::GetCarData(int Ident) {
@@ -146,6 +146,8 @@ std::optional<std::weak_ptr<TClient>> GetClient(TServer& Server, int ID) {
                MaybeClient = CPtr;
                return false;
            }
+        } else {
+            beammp_debugf("Found an expired client while looking for id {}", ID);
        }
        return true;
    });
--- a/src/Common.cpp
+++ b/src/Common.cpp
@@ -1,8 +1,10 @@
 #include "Common.h"

+#include "Env.h"
 #include "TConsole.h"
 #include <array>
 #include <charconv>
+#include <fmt/core.h>
 #include <iostream>
 #include <map>
 #include <regex>
@@ -201,8 +203,11 @@ void Application::CheckForUpdates() {
            auto MyVersion = ServerVersion();
            auto RemoteVersion = Version(VersionStrToInts(Response));
            if (IsOutdated(MyVersion, RemoteVersion)) {
-                std::string RealVersionString = RemoteVersion.AsString();
-                beammp_warn(std::string(ANSI_YELLOW_BOLD) + "NEW VERSION IS OUT! Please update to the new version (v" + RealVersionString + ") of the BeamMP-Server! Download it here: https://beammp.com/! For a guide on how to update, visit: https://wiki.beammp.com/en/home/server-maintenance#updating-the-server" + std::string(ANSI_RESET));
+                std::string RealVersionString = std::string("v") + RemoteVersion.AsString();
+                const std::string DefaultUpdateMsg = "NEW VERSION IS OUT! Please update to the new version ({}) of the BeamMP-Server! Download it here: https://beammp.com/! For a guide on how to update, visit: https://wiki.beammp.com/en/home/server-maintenance#updating-the-server";
+                auto UpdateMsg = Env::Get(Env::Key::PROVIDER_UPDATE_MESSAGE).value_or(DefaultUpdateMsg);
+                UpdateMsg = fmt::vformat(std::string_view(UpdateMsg), fmt::make_format_args(RealVersionString));
+                beammp_warnf("{}{}{}", ANSI_YELLOW_BOLD, UpdateMsg, ANSI_RESET);
            } else {
                if (FirstTime) {
                    beammp_info("Server up-to-date!");
@@ -270,6 +275,8 @@ void RegisterThread(const std::string& str) {
    ThreadId = std::to_string(getpid()); // todo: research if 'getpid()' is a valid, posix compliant alternative to 'gettid()'
 #elif defined(BEAMMP_LINUX)
    ThreadId = std::to_string(gettid());
+#elif defined(BEAMMP_FREEBSD)
+    ThreadId = std::to_string(getpid());
 #endif
    if (Application::Settings.DebugModeEnabled) {
        std::ofstream ThreadFile(".Threads.log", std::ios::app);
@@ -348,3 +355,14 @@ std::string GetPlatformAgnosticErrorString() {
    return "(no human-readable errors on this platform)";
 #endif
 }
+
+// TODO: add unit tests to SplitString
+void SplitString(const std::string& str, const char delim, std::vector<std::string>& out) {
+    size_t start;
+    size_t end = 0;
+
+    while ((start = str.find_first_not_of(delim, end)) != std::string::npos) {
+        end = str.find(delim, start);
+        out.push_back(str.substr(start, end - start));
+    }
+}
--- a/src/Compat.cpp
+++ b/src/Compat.cpp
@@ -41,7 +41,9 @@ TEST_CASE("init and reset termios") {
        CHECK_EQ(current.c_iflag, original.c_iflag);
        CHECK_EQ(current.c_ispeed, original.c_ispeed);
        CHECK_EQ(current.c_lflag, original.c_lflag);
+#ifndef BEAMMP_FREEBSD // The 'c_line' attribute seems to only exist on Linux, so we need to omit it on other platforms
        CHECK_EQ(current.c_line, original.c_line);
+#endif 
        CHECK_EQ(current.c_oflag, original.c_oflag);
        CHECK_EQ(current.c_ospeed, original.c_ospeed);
    }
--- a/src/Env.cpp
+++ b/src/Env.cpp
@@ -0,0 +1,20 @@
+#include "Env.h"
+#include <optional>
+
+std::optional<std::string> Env::Get(Env::Key key) {
+    auto StrKey = ToString(key);
+    auto Value = std::getenv(StrKey.data());
+    if (!Value || std::string_view(Value).empty()) {
+        return std::nullopt;
+    }
+    return Value;
+}
+
+std::string_view Env::ToString(Env::Key key) {
+    switch (key) {
+    case Key::PROVIDER_UPDATE_MESSAGE:
+        return "BEAMMP_PROVIDER_UPDATE_MESSAGE";
+        break;
+    }
+    return "";
+}
--- a/src/TConfig.cpp
+++ b/src/TConfig.cpp
@@ -1,6 +1,7 @@
 #include "Common.h"

 #include "TConfig.h"
+#include <cstdlib>
 #include <fstream>
 #include <iostream>
 #include <istream>
@@ -8,30 +9,36 @@

 // General
 static constexpr std::string_view StrDebug = "Debug";
+static constexpr std::string_view EnvStrDebug = "BEAMMP_DEBUG";
 static constexpr std::string_view StrPrivate = "Private";
+static constexpr std::string_view EnvStrPrivate = "BEAMMP_PRIVATE";
 static constexpr std::string_view StrPort = "Port";
+static constexpr std::string_view EnvStrPort = "BEAMMP_PORT";
 static constexpr std::string_view StrMaxCars = "MaxCars";
+static constexpr std::string_view EnvStrMaxCars = "BEAMMP_MAX_CARS";
 static constexpr std::string_view StrMaxPlayers = "MaxPlayers";
+static constexpr std::string_view EnvStrMaxPlayers = "BEAMMP_MAX_PLAYERS";
 static constexpr std::string_view StrMap = "Map";
+static constexpr std::string_view EnvStrMap = "BEAMMP_MAP";
 static constexpr std::string_view StrName = "Name";
+static constexpr std::string_view EnvStrName = "BEAMMP_NAME";
 static constexpr std::string_view StrDescription = "Description";
+static constexpr std::string_view EnvStrDescription = "BEAMMP_DESCRIPTION";
+static constexpr std::string_view StrTags = "Tags";
+static constexpr std::string_view EnvStrTags = "BEAMMP_TAGS";
 static constexpr std::string_view StrResourceFolder = "ResourceFolder";
+static constexpr std::string_view EnvStrResourceFolder = "BEAMMP_RESOURCE_FOLDER";
 static constexpr std::string_view StrAuthKey = "AuthKey";
+static constexpr std::string_view EnvStrAuthKey = "BEAMMP_AUTH_KEY";
 static constexpr std::string_view StrLogChat = "LogChat";
+static constexpr std::string_view EnvStrLogChat = "BEAMMP_LOG_CHAT";
+static constexpr std::string_view StrPassword = "Password";

 // Misc
 static constexpr std::string_view StrSendErrors = "SendErrors";
 static constexpr std::string_view StrSendErrorsMessageEnabled = "SendErrorsShowMessage";
 static constexpr std::string_view StrHideUpdateMessages = "ImScaredOfUpdates";

-// 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";
-
 TEST_CASE("TConfig::TConfig") {
    const std::string CfgFile = "beammp_server_testconfig.toml";
    fs::remove(CfgFile);
@@ -55,7 +62,6 @@ TEST_CASE("TConfig::TConfig") {
    const auto table = toml::parse(CfgFile);
    CHECK(table.at("General").is_table());
    CHECK(table.at("Misc").is_table());
-    CHECK(table.at("HTTP").is_table());

    fs::remove(CfgFile);
 }
@@ -101,32 +107,26 @@ void TConfig::FlushToFile() {
    data["General"][StrPrivate.data()] = Application::Settings.Private;
    data["General"][StrPort.data()] = Application::Settings.Port;
    data["General"][StrName.data()] = Application::Settings.ServerName;
+    SetComment(data["General"][StrTags.data()].comments(), " Add custom identifying tags to your server to make it easier to find. Format should be TagA,TagB,TagC. Note the comma seperation.");
+    data["General"][StrTags.data()] = Application::Settings.ServerTags;
    data["General"][StrMaxCars.data()] = Application::Settings.MaxCars;
    data["General"][StrMaxPlayers.data()] = Application::Settings.MaxPlayers;
    data["General"][StrMap.data()] = Application::Settings.MapName;
    data["General"][StrDescription.data()] = Application::Settings.ServerDesc;
    data["General"][StrResourceFolder.data()] = Application::Settings.Resource;
+    // data["General"][StrPassword.data()] = Application::Settings.Password;
+    // SetComment(data["General"][StrPassword.data()].comments(), " Sets a password on this server, which restricts people from joining. To join, a player must enter this exact password. Leave empty ("") to disable the password.");
    // Misc
    data["Misc"][StrHideUpdateMessages.data()] = Application::Settings.HideUpdateMessages;
    SetComment(data["Misc"][StrHideUpdateMessages.data()].comments(), " Hides the periodic update message which notifies you of a new server version. You should really keep this on and always update as soon as possible. For more information visit https://wiki.beammp.com/en/home/server-maintenance#updating-the-server. An update message will always appear at startup regardless.");
    data["Misc"][StrSendErrors.data()] = Application::Settings.SendErrors;
-    SetComment(data["Misc"][StrSendErrors.data()].comments(), " You can turn on/off the SendErrors message you get on startup here");
+    SetComment(data["Misc"][StrSendErrors.data()].comments(), " If SendErrors is `true`, the server will send helpful info about crashes and other issues back to the BeamMP developers. This info may include your config, who is on your server at the time of the error, and similar general information. This kind of data is vital in helping us diagnose and fix issues faster. This has no impact on server performance. You can opt-out of this system by setting this to `false`");
    data["Misc"][StrSendErrorsMessageEnabled.data()] = Application::Settings.SendErrorsMessageEnabled;
-    SetComment(data["Misc"][StrSendErrorsMessageEnabled.data()].comments(), " 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");
+    SetComment(data["Misc"][StrSendErrorsMessageEnabled.data()].comments(), " You can turn on/off the SendErrors message you get on startup here");
    std::stringstream Ss;
    Ss << "# This is the BeamMP-Server config file.\n"
          "# Help & Documentation: `https://wiki.beammp.com/en/home/server-maintenance`\n"
-          "# IMPORTANT: Fill in the AuthKey with the key you got from `https://beammp.com/k/dashboard` on the left under \"Keys\"\n"
+          "# IMPORTANT: Fill in the AuthKey with the key you got from `https://keymaster.beammp.com/` on the left under \"Keys\"\n"
       << data;
    auto File = std::fopen(mConfigFileName.c_str(), "w+");
    if (!File) {
@@ -156,19 +156,38 @@ void TConfig::CreateConfigFile() {
    FlushToFile();
 }

-void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, std::string& OutValue) {
+void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, std::string& OutValue) {
+    if (!Env.empty()) {
+        if (const char* envp = std::getenv(Env.data()); envp != nullptr && std::strcmp(envp, "") != 0) {
+            OutValue = std::string(envp);
+            return;
+        }
+    }
    if (Table[Category.c_str()][Key.data()].is_string()) {
        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) {
+void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, bool& OutValue) {
+    if (!Env.empty()) {
+        if (const char* envp = std::getenv(Env.data()); envp != nullptr && std::strcmp(envp, "") != 0) {
+            auto Str = std::string(envp);
+            OutValue = Str == "1" || Str == "true";
+            return;
+        }
+    }
    if (Table[Category.c_str()][Key.data()].is_boolean()) {
        OutValue = Table[Category.c_str()][Key.data()].as_boolean();
    }
 }

-void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, int& OutValue) {
+void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, int& OutValue) {
+    if (!Env.empty()) {
+        if (const char* envp = std::getenv(Env.data()); envp != nullptr && std::strcmp(envp, "") != 0) {
+            OutValue = int(std::strtol(envp, nullptr, 10));
+            return;
+        }
+    }
    if (Table[Category.c_str()][Key.data()].is_integer()) {
        OutValue = int(Table[Category.c_str()][Key.data()].as_integer());
    }
@@ -178,28 +197,23 @@ 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);
-        TryReadValue(data, "General", StrLogChat, Application::Settings.LogChat);
+        TryReadValue(data, "General", StrDebug, EnvStrDebug, Application::Settings.DebugModeEnabled);
+        TryReadValue(data, "General", StrPrivate, EnvStrPrivate, Application::Settings.Private);
+        TryReadValue(data, "General", StrPort, EnvStrPort, Application::Settings.Port);
+        TryReadValue(data, "General", StrMaxCars, EnvStrMaxCars, Application::Settings.MaxCars);
+        TryReadValue(data, "General", StrMaxPlayers, EnvStrMaxPlayers, Application::Settings.MaxPlayers);
+        TryReadValue(data, "General", StrMap, EnvStrMap, Application::Settings.MapName);
+        TryReadValue(data, "General", StrName, EnvStrName, Application::Settings.ServerName);
+        TryReadValue(data, "General", StrDescription, EnvStrDescription, Application::Settings.ServerDesc);
+        TryReadValue(data, "General", StrTags, EnvStrTags, Application::Settings.ServerTags);
+        TryReadValue(data, "General", StrResourceFolder, EnvStrResourceFolder, Application::Settings.Resource);
+        TryReadValue(data, "General", StrAuthKey, EnvStrAuthKey, Application::Settings.Key);
+        TryReadValue(data, "General", StrLogChat, EnvStrLogChat, Application::Settings.LogChat);
+        TryReadValue(data, "General", StrPassword, "", Application::Settings.Password);
        // Misc
-        TryReadValue(data, "Misc", StrSendErrors, 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);
+        TryReadValue(data, "Misc", StrSendErrors, "", Application::Settings.SendErrors);
+        TryReadValue(data, "Misc", StrHideUpdateMessages, "", Application::Settings.HideUpdateMessages);
+        TryReadValue(data, "Misc", StrSendErrorsMessageEnabled, "", Application::Settings.SendErrorsMessageEnabled);
    } catch (const std::exception& err) {
        beammp_error("Error parsing config file value: " + std::string(err.what()));
        mFailed = true;
@@ -232,14 +246,12 @@ void TConfig::PrintDebug() {
    beammp_debug(std::string(StrMap) + ": \"" + Application::Settings.MapName + "\"");
    beammp_debug(std::string(StrName) + ": \"" + Application::Settings.ServerName + "\"");
    beammp_debug(std::string(StrDescription) + ": \"" + Application::Settings.ServerDesc + "\"");
+    beammp_debug(std::string(StrTags) + ": " + TagsAsPrettyArray());
    beammp_debug(std::string(StrLogChat) + ": \"" + (Application::Settings.LogChat ? "true" : "false") + "\"");
    beammp_debug(std::string(StrResourceFolder) + ": \"" + Application::Settings.Resource + "\"");
-    beammp_debug(std::string(StrSSLKeyPath) + ": \"" + Application::Settings.SSLKeyPath + "\"");
-    beammp_debug(std::string(StrSSLCertPath) + ": \"" + Application::Settings.SSLCertPath + "\"");
-    beammp_debug(std::string(StrHTTPServerPort) + ": \"" + std::to_string(Application::Settings.HTTPServerPort) + "\"");
-    beammp_debug(std::string(StrHTTPServerIP) + ": \"" + Application::Settings.HTTPServerIP + "\"");
    // special!
    beammp_debug("Key Length: " + std::to_string(Application::Settings.Key.length()) + "");
+    beammp_debug("Password Protected: " + std::string(Application::Settings.Password.empty() ? "false" : "true"));
 }

 void TConfig::ParseOldFormat() {
@@ -294,3 +306,13 @@ void TConfig::ParseOldFormat() {
        Str >> std::ws;
    }
 }
+std::string TConfig::TagsAsPrettyArray() const {
+    std::vector<std::string> TagsArray = {};
+    SplitString(Application::Settings.ServerTags, ',', TagsArray);
+    std::string Pretty = {};
+    for (size_t i = 0; i < TagsArray.size() - 1; ++i) {
+        Pretty += '\"' + TagsArray[i] + "\", ";
+    }
+    Pretty += '\"' + TagsArray.at(TagsArray.size() - 1) + "\"";
+    return Pretty;
+}
--- a/src/TConsole.cpp
+++ b/src/TConsole.cpp
@@ -52,17 +52,6 @@ TEST_CASE("TrimString") {
    CHECK(TrimString("") == "");
 }

-// TODO: add unit tests to SplitString
-static inline void SplitString(std::string const& str, const char delim, std::vector<std::string>& out) {
-    size_t start;
-    size_t end = 0;
-
-    while ((start = str.find_first_not_of(delim, end)) != std::string::npos) {
-        end = str.find(delim, start);
-        out.push_back(str.substr(start, end - start));
-    }
-}
-
 static std::string GetDate() {
    std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
    time_t tt = std::chrono::system_clock::to_time_t(now);
@@ -157,13 +146,13 @@ void TConsole::ChangeToLuaConsole(const std::string& LuaStateId) {
        mIsLuaConsole = true;
        if (mStateId != mDefaultStateId) {
            Application::Console().WriteRaw("Attached to Lua state '" + mStateId + "'. For help, type `:help`. To detach, type `:exit`");
-            mCommandline.set_prompt("lua @" + LuaStateId + "> ");
+            mCommandline->set_prompt("lua @" + LuaStateId + "> ");
        } else {
            Application::Console().WriteRaw("Attached to Lua. For help, type `:help`. To detach, type `:exit`");
-            mCommandline.set_prompt("lua> ");
+            mCommandline->set_prompt("lua> ");
        }
-        mCachedRegularHistory = mCommandline.history();
-        mCommandline.set_history(mCachedLuaHistory);
+        mCachedRegularHistory = mCommandline->history();
+        mCommandline->set_history(mCachedLuaHistory);
    }
 }

@@ -175,9 +164,9 @@ void TConsole::ChangeToRegularConsole() {
        } else {
            Application::Console().WriteRaw("Detached from Lua.");
        }
-        mCachedLuaHistory = mCommandline.history();
-        mCommandline.set_history(mCachedRegularHistory);
-        mCommandline.set_prompt("> ");
+        mCachedLuaHistory = mCommandline->history();
+        mCommandline->set_history(mCachedRegularHistory);
+        mCommandline->set_prompt("> ");
        mStateId = mDefaultStateId;
    }
 }
@@ -257,7 +246,7 @@ void TConsole::Command_Clear(const std::string&, const std::vector<std::string>&
    if (!EnsureArgsCount(args, 0, size_t(-1))) {
        return;
    }
-    mCommandline.write("\x1b[;H\x1b[2J");
+    mCommandline->write("\x1b[;H\x1b[2J");
 }

 void TConsole::Command_Kick(const std::string&, const std::vector<std::string>& args) {
@@ -589,16 +578,20 @@ Commands
 }

 TConsole::TConsole() {
-    mCommandline.enable_history();
-    mCommandline.set_history_limit(20);
-    mCommandline.set_prompt("> ");
+}
+
+void TConsole::InitializeCommandline() {
+    mCommandline = std::make_unique<Commandline>();
+    mCommandline->enable_history();
+    mCommandline->set_history_limit(20);
+    mCommandline->set_prompt("> ");
    BackupOldLog();
-    mCommandline.on_command = [this](Commandline& c) {
+    mCommandline->on_command = [this](Commandline& c) {
        try {
            auto TrimmedCmd = c.get_command();
            TrimmedCmd = TrimString(TrimmedCmd);
            auto [cmd, args] = ParseCommand(TrimmedCmd);
-            mCommandline.write(mCommandline.prompt() + TrimmedCmd);
+            mCommandline->write(mCommandline->prompt() + TrimmedCmd);
            if (mIsLuaConsole) {
                if (!mLuaEngine) {
                    beammp_info("Lua not started yet, please try again in a second");
@@ -606,9 +599,7 @@ TConsole::TConsole() {
                    HandleLuaInternalCommand(cmd.substr(1));
                } else {
                    auto Future = mLuaEngine->EnqueueScript(mStateId, { std::make_shared<std::string>(TrimmedCmd), "", "" });
-                    while (!Future->Ready) {
-                        std::this_thread::yield(); // TODO: Add a timeout
-                    }
+                    Future->WaitUntilReady();
                    if (Future->Error) {
                        beammp_lua_error("error in " + mStateId + ": " + Future->ErrorMessage);
                    }
@@ -635,7 +626,7 @@ TConsole::TConsole() {
            beammp_error("Console died with: " + std::string(e.what()) + ". This could be a fatal error and could cause the server to terminate.");
        }
    };
-    mCommandline.on_autocomplete = [this](Commandline&, std::string stub, int) {
+    mCommandline->on_autocomplete = [this](Commandline&, std::string stub, int) {
        std::vector<std::string> suggestions;
        try {
            if (mIsLuaConsole) { // if lua
@@ -705,11 +696,21 @@ TConsole::TConsole() {

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

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

 void TConsole::InitializeLuaConsole(TLuaEngine& Engine) {
--- a/src/THeartbeatThread.cpp
+++ b/src/THeartbeatThread.cpp
@@ -129,11 +129,13 @@ std::string THeartbeatThread::GenerateCall() {
        << "&version=" << Application::ServerVersionString()
        << "&clientversion=" << std::to_string(Application::ClientMajorVersion()) + ".0" // FIXME: Wtf.
        << "&name=" << Application::Settings.ServerName
+        << "&tags=" << Application::Settings.ServerTags
        << "&modlist=" << mResourceManager.TrimmedList()
        << "&modstotalsize=" << mResourceManager.MaxModSize()
        << "&modstotal=" << mResourceManager.ModsLoaded()
        << "&playerslist=" << GetPlayers()
-        << "&desc=" << Application::Settings.ServerDesc;
+        << "&desc=" << Application::Settings.ServerDesc
+        << "&pass=" << (Application::Settings.Password.empty() ? "false" : "true");
    return Ret.str();
 }
 THeartbeatThread::THeartbeatThread(TResourceManager& ResourceManager, TServer& Server)
--- a/src/TLuaEngine.cpp
+++ b/src/TLuaEngine.cpp
@@ -286,6 +286,7 @@ void TLuaEngine::WaitForAll(std::vector<std::shared_ptr<TLuaResult>>& Results, c
        bool Cancelled = false;
        size_t ms = 0;
        std::set<std::string> WarnedResults;
+
        while (!Result->Ready && !Cancelled) {
            std::this_thread::sleep_for(std::chrono::milliseconds(10));
            ms += 10;
@@ -300,6 +301,7 @@ void TLuaEngine::WaitForAll(std::vector<std::shared_ptr<TLuaResult>>& Results, c
                }
            }
        }
+
        if (Cancelled) {
            beammp_lua_warn("'" + Result->Function + "' in '" + Result->StateId + "' failed to execute in time and was not waited for. It may still finish executing at a later time.");
            LuaAPI::MP::Engine->ReportErrors({ Result });
@@ -425,7 +427,7 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string
                Result->Error = true;
                Result->ErrorMessage = "Function result in TriggerGlobalEvent was invalid";
            }
-            Result->Ready = true;
+            Result->MarkAsReady();
            Return.push_back(Result);
        }
    }
@@ -599,7 +601,7 @@ std::pair<sol::table, std::string> TLuaEngine::StateThreadData::Lua_GetPositionR
        return Result;
    } else {
        // return std::make_tuple(sol::lua_nil, sol::make_object(StateView, "Client expired"));
-        Result.second = "Client expired";
+        Result.second = "No such player";
        return Result;
    }
 }
@@ -955,7 +957,7 @@ void TLuaEngine::StateThreadData::operator()() {
                    sol::error Err = Res;
                    S.second->ErrorMessage = Err.what();
                }
-                S.second->Ready = true;
+                S.second->MarkAsReady();
            }
        }
        { // StateFunctionQueue Scope
@@ -1016,11 +1018,11 @@ void TLuaEngine::StateThreadData::operator()() {
                        sol::error Err = Res;
                        Result->ErrorMessage = Err.what();
                    }
-                    Result->Ready = true;
+                    Result->MarkAsReady();
                } else {
                    Result->Error = true;
                    Result->ErrorMessage = BeamMPFnNotFoundError; // special error kind that we can ignore later
-                    Result->Ready = true;
+                    Result->MarkAsReady();
                }
            }
        }
@@ -1070,11 +1072,19 @@ void TLuaEngine::StateThreadData::AddPath(const fs::path& Path) {
    mPaths.push(Path);
 }

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

 TLuaChunk::TLuaChunk(std::shared_ptr<std::string> Content, std::string FileName, std::string PluginPath)
--- a/src/TNetwork.cpp
+++ b/src/TNetwork.cpp
@@ -11,6 +11,8 @@
 #include <boost/asio/ip/address_v4.hpp>
 #include <cstring>

+typedef boost::asio::detail::socket_option::integer<SOL_SOCKET, SO_RCVTIMEO> rcv_timeout_option;
+
 std::vector<uint8_t> StringToVector(const std::string& Str) {
    return std::vector<uint8_t>(Str.data(), Str.data() + Str.size());
 }
@@ -99,7 +101,7 @@ void TNetwork::UDPServerMain() {
                    Client->SetUDPAddr(client);
                    Client->SetIsConnected(true);
                    Data.erase(Data.begin(), Data.begin() + 2);
-                    TServer::GlobalParser(ClientPtr, std::move(Data), mPPSMonitor, *this);
+                    mServer.GlobalParser(ClientPtr, std::move(Data), mPPSMonitor, *this);
                }

                return true;
@@ -225,6 +227,15 @@ void TNetwork::HandleDownload(TConnection&& Conn) {
    });
 }

+std::string HashPassword(const std::string& str) {
+    std::stringstream ret;
+    unsigned char* hash = SHA256(reinterpret_cast<const unsigned char*>(str.c_str()), str.length(), nullptr);
+    for (int i = 0; i < 32; i++) {
+        ret << std::hex << static_cast<int>(hash[i]);
+    }
+    return ret.str();
+}
+
 std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
    auto Client = CreateClient(std::move(RawConnection.Socket));
    Client->SetIdentifier("ip", RawConnection.SockAddr.address().to_string());
@@ -248,7 +259,8 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
        ClientKick(*Client, fmt::format("Invalid version header: '{}' ({})", std::string(reinterpret_cast<const char*>(Data.data()), Data.size()), Data.size()));
        return nullptr;
    }
-    if (!TCPSend(*Client, StringToVector("S"))) {
+
+    if (!TCPSend(*Client, StringToVector("A"))) { //changed to A for Accepted version
        // TODO: handle
    }

@@ -304,6 +316,22 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
        return nullptr;
    }

+    if(!Application::Settings.Password.empty()) { // ask password
+        if(!TCPSend(*Client, StringToVector("S"))) {
+            // TODO: handle
+        }
+        beammp_info("Waiting for password");
+        Data = TCPRcv(*Client);
+        std::string Pass = std::string(reinterpret_cast<const char*>(Data.data()), Data.size());
+        if(Pass != HashPassword(Application::Settings.Password)) {
+            beammp_debug(Client->GetName() + " attempted to connect with a wrong password");
+            ClientKick(*Client, "Wrong password!");
+            return {};
+        } else {
+            beammp_debug(Client->GetName() + " used the correct password");
+        }
+    }
+
    beammp_debug("Name -> " + Client->GetName() + ", Guest -> " + std::to_string(Client->IsGuest()) + ", Roles -> " + Client->GetRoles());
    mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
        std::shared_ptr<TClient> Cl;
@@ -353,6 +381,7 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
    } else {
        ClientKick(*Client, "Server full!");
    }
+
    return Client;
 }

@@ -523,7 +552,7 @@ void TNetwork::TCPClient(const std::weak_ptr<TClient>& c) {
            Client->Disconnect("TCPRcv failed");
            break;
        }
-        TServer::GlobalParser(c, std::move(res), mPPSMonitor, *this);
+        mServer.GlobalParser(c, std::move(res), mPPSMonitor, *this);
    }

    if (QueueSync.joinable())
--- a/src/TPluginMonitor.cpp
+++ b/src/TPluginMonitor.cpp
@@ -1,6 +1,7 @@
 #include "TPluginMonitor.h"

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

 TPluginMonitor::TPluginMonitor(const fs::path& Path, std::shared_ptr<TLuaEngine> Engine)
    : mEngine(Engine)
@@ -9,7 +10,7 @@ TPluginMonitor::TPluginMonitor(const fs::path& Path, std::shared_ptr<TLuaEngine>
    if (!fs::exists(mPath)) {
        fs::create_directories(mPath);
    }
-    for (const auto& Entry : fs::recursive_directory_iterator(mPath)) {
+    for (const auto& Entry : fs::recursive_directory_iterator(mPath, fs::directory_options::follow_directory_symlink)) {
        // TODO: trigger an event when a subfolder file changes
        if (Entry.is_regular_file()) {
            mFileTimes[Entry.path().string()] = fs::last_write_time(Entry.path());
--- a/src/TServer.cpp
+++ b/src/TServer.cpp
@@ -7,6 +7,7 @@
 #include <TLuaPlugin.h>
 #include <algorithm>
 #include <any>
+#include <optional>
 #include <sstream>

 #include <nlohmann/json.hpp>
@@ -51,6 +52,30 @@ TEST_CASE("GetPidVid") {
        CHECK_EQ(pid, 10);
        CHECK_EQ(vid, 12);
    }
+    SUBCASE("Valid doubledigit 2") {
+        const auto MaybePidVid = GetPidVid("10-2");
+        CHECK(MaybePidVid);
+        auto [pid, vid] = MaybePidVid.value();
+
+        CHECK_EQ(pid, 10);
+        CHECK_EQ(vid, 2);
+    }
+    SUBCASE("Valid doubledigit 3") {
+        const auto MaybePidVid = GetPidVid("33-23");
+        CHECK(MaybePidVid);
+        auto [pid, vid] = MaybePidVid.value();
+
+        CHECK_EQ(pid, 33);
+        CHECK_EQ(vid, 23);
+    }
+    SUBCASE("Valid doubledigit 4") {
+        const auto MaybePidVid = GetPidVid("3-23");
+        CHECK(MaybePidVid);
+        auto [pid, vid] = MaybePidVid.value();
+
+        CHECK_EQ(pid, 3);
+        CHECK_EQ(vid, 23);
+    }
    SUBCASE("Empty string") {
        const auto MaybePidVid = GetPidVid("");
        CHECK(!MaybePidVid);
@@ -214,6 +239,7 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uin
        PPSMonitor.IncrementInternalPPS();
        Network.SendToAll(LockedClient.get(), Packet, false, false);
        HandlePosition(*LockedClient, StringPacket);
+        return;
    default:
        return;
    }
@@ -388,7 +414,7 @@ void TServer::Apply(TClient& c, int VID, const std::string& pckt) {

    FoundPos = VD.find('{');
    if (FoundPos == std::string::npos) {
-       return;
+        return;
    }
    VD = VD.substr(FoundPos);
    rapidjson::Document Veh, Pack;
@@ -422,35 +448,63 @@ void TServer::InsertClient(const std::shared_ptr<TClient>& NewClient) {
    (void)mClients.insert(NewClient);
 }

-void TServer::HandlePosition(TClient& c, const std::string& Packet) {
+struct PidVidData {
+    int PID;
+    int VID;
+    std::string Data;
+};
+
+static std::optional<PidVidData> ParsePositionPacket(const std::string& Packet) {
    if (Packet.size() < 3) {
        // invalid packet
-        return;
+        return std::nullopt;
    }
-    // Zp:serverVehicleID:data
-    // Zp:0:data
+    // Zp:PID-VID:DATA
    std::string withoutCode = Packet.substr(3);
-    auto NameDataSep = withoutCode.find(':', 2);
-    if (NameDataSep == std::string::npos || NameDataSep < 2) {
-        // invalid packet
-        return;
-    }
-    // FIXME: ensure that -2 does what it should... it seems weird.
-    std::string ServerVehicleID = withoutCode.substr(2, NameDataSep - 2);
-    if (NameDataSep + 1 > withoutCode.size()) {
-        // invalid packet
-        return;
-    }
-    std::string Data = withoutCode.substr(NameDataSep + 1);

    // parse veh ID
-    auto MaybePidVid = GetPidVid(ServerVehicleID);
-    if (MaybePidVid) {
-        int PID = -1;
-        int VID = -1;
-        // FIXME: check that the VID and PID are valid, so that we don't waste memory
-        std::tie(PID, VID) = MaybePidVid.value();
+    if (auto DataBeginPos = withoutCode.find('{'); DataBeginPos != std::string::npos && DataBeginPos != 0) {
+        // separator is :{, so position of { minus one
+        auto PidVidOnly = withoutCode.substr(0, DataBeginPos - 1);
+        auto MaybePidVid = GetPidVid(PidVidOnly);
+        if (MaybePidVid) {
+            int PID = -1;
+            int VID = -1;
+            // FIXME: check that the VID and PID are valid, so that we don't waste memory
+            std::tie(PID, VID) = MaybePidVid.value();

-        c.SetCarPosition(VID, Data);
+            std::string Data = withoutCode.substr(DataBeginPos);
+            return PidVidData {
+                .PID = PID,
+                .VID = VID,
+                .Data = Data,
+            };
+        } else {
+            // invalid packet
+            return std::nullopt;
+        }
+    }
+    // invalid packet
+    return std::nullopt;
+}
+
+TEST_CASE("ParsePositionPacket") {
+    const auto TestData = R"({"tim":10.428000331623,"vel":[-2.4171722121385e-05,-9.7184734153252e-06,-7.6420763232237e-06],"rot":[-0.0001296154171915,0.0031575385950029,0.98994906610295,0.14138903660382],"rvel":[5.3640324636461e-05,-9.9824529946024e-05,5.1664064641372e-05],"pos":[-0.27281248907838,-0.20515357944633,0.49695488960431],"ping":0.032999999821186})";
+    SUBCASE("All the pids and vids") {
+        for (int pid = 0; pid < 100; ++pid) {
+            for (int vid = 0; vid < 100; ++vid) {
+                std::optional<PidVidData> MaybeRes = ParsePositionPacket(fmt::format("Zp:{}-{}:{}", pid, vid, TestData));
+                CHECK(MaybeRes.has_value());
+                CHECK_EQ(MaybeRes.value().PID, pid);
+                CHECK_EQ(MaybeRes.value().VID, vid);
+                CHECK_EQ(MaybeRes.value().Data, TestData);
+            }
+        }
+    }
+}
+
+void TServer::HandlePosition(TClient& c, const std::string& Packet) {
+    if (auto Parsed = ParsePositionPacket(Packet); Parsed.has_value()) {
+        c.SetCarPosition(Parsed.value().VID, Parsed.value().Data);
    }
 }
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -69,7 +69,6 @@ int main(int argc, char** argv) {

 int BeamMPServerMain(MainArguments Arguments) {
    setlocale(LC_ALL, "C");
-    Application::InitializeConsole();
    ArgsParser Parser;
    Parser.RegisterArgument({ "help" }, ArgsParser::NONE);
    Parser.RegisterArgument({ "version" }, ArgsParser::NONE);
@@ -80,12 +79,10 @@ int BeamMPServerMain(MainArguments Arguments) {
        return 1;
    }
    if (Parser.FoundArgument({ "help" })) {
-        Application::Console().Internal().set_prompt("");
        Application::Console().WriteRaw(sCommandlineArguments);
        return 0;
    }
    if (Parser.FoundArgument({ "version" })) {
-        Application::Console().Internal().set_prompt("");
        Application::Console().WriteRaw("BeamMP-Server v" + Application::ServerVersionString());
        return 0;
    }
@@ -109,11 +106,22 @@ int BeamMPServerMain(MainArguments Arguments) {
            }
        }
    }
+    
+    TConfig Config(ConfigPath);
+
+    if (Config.Failed()) {
+        beammp_info("Closing in 10 seconds");
+        // loop to make it possible to ctrl+c instead
+        for (size_t i = 0; i < 20; ++i) {
+            std::this_thread::sleep_for(std::chrono::milliseconds(500));
+        }
+        return 1;
+    }
+    Application::InitializeConsole();
+    Application::Console().StartLoggingToFile();

    Application::SetSubsystemStatus("Main", Application::Status::Starting);

-    Application::Console().StartLoggingToFile();
-
    SetupSignalHandlers();

    bool Shutdown = false;
@@ -128,20 +136,11 @@ int BeamMPServerMain(MainArguments Arguments) {
    });

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