fix postfix formatting

this is an artifact from the --update process on windows

.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: ''
 

.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: ''
 
 ---

.github/workflows/linux.yml

@@ -4,6 +4,7 @@ on: [push]
 
 env: 
   VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
+  CMAKE_BUILD_TYPE: "Release"
 
 jobs:
   debian-11-build:
@@ -46,14 +47,20 @@ jobs:
           name: BeamMP-Server-debian
           path: ./bin/BeamMP-Server
 
+      - name: Archive server debug info artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: BeamMP-Server-debian.debug
+          path: ./bin/BeamMP-Server.debug
+
       - name: Build Tests
         run: bash ./scripts/debian-11/3-build-tests.sh
 
-      - name: Archive server tests artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: BeamMP-Server-debian-tests
-          path: ./bin/BeamMP-Server-tests
+      - name: Install Runtime Dependencies
+        run: bash ./scripts/debian-11/4-install-runtime-deps.sh
+
+      - name: Test
+        run: ./bin/BeamMP-Server-tests
 
   ubuntu-22-04-build:
     runs-on: ubuntu-latest
@@ -100,51 +107,17 @@ jobs:
           name: BeamMP-Server-ubuntu
           path: ./bin/BeamMP-Server
       
+      - name: Archive server debug info artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: BeamMP-Server-ubuntu.debug
+          path: ./bin/BeamMP-Server.debug
+
       - name: Build Tests
         run: bash ./scripts/ubuntu-22.04/3-build-tests.sh
 
-      - name: Archive server tests artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: BeamMP-Server-ubuntu-tests
-          path: ./bin/BeamMP-Server-tests
-
-  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/ubuntu-22.04/4-install-runtime-deps.sh
 
       - name: Test
-        run: |
-            chmod +x ./BeamMP-Server-tests
-            ./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
+        run: ./bin/BeamMP-Server-tests

.github/workflows/release.yml

@@ -7,6 +7,7 @@ on:
 
 env:
   VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
+  CMAKE_BUILD_TYPE: "Release"
 
 jobs:
   create-release:
@@ -27,7 +28,7 @@ jobs:
           prerelease: true
           body: |
               Files included in this release:
-              - `BeamMP-Server.exe` is the windows build.
+              - `BeamMP-Server.exe` is the windows build. You need to install the [Visual C++ Redistributables](https://aka.ms/vs/17/release/vc_redist.x64.exe) to run this.
               - `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`.
 
@@ -82,6 +83,17 @@ jobs:
           asset_path: ./bin/BeamMP-Server
           asset_name: BeamMP-Server-debian
           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:
+          upload_url: ${{ needs.create-release.outputs.upload_url }}
+          asset_path: ./bin/BeamMP-Server.debug
+          asset_name: debuginfo-debian.debug
+          asset_content_type: application/x-elf
     
   upload-release-files-ubuntu-22-04:
     name: Build and upload Ubuntu 22.04 Release Files
@@ -113,11 +125,6 @@ jobs:
       - name: Install Dependencies
         run: bash ./scripts/ubuntu-22.04/1-install-deps.sh
 
-      - name: Setup vcpkg
-        uses: lukka/run-vcpkg@v11
-        with:
-          runVcpkgInstall: true
-
       - name: Create Build Environment
         run: bash ./scripts/ubuntu-22.04/2-configure.sh '-DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake'
 
@@ -135,8 +142,19 @@ jobs:
           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:
+          upload_url: ${{ needs.create-release.outputs.upload_url }}
+          asset_path: ./bin/BeamMP-Server.debug
+          asset_name: debuginfo-ubuntu.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 +171,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 +188,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

.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
 

CMakeLists.txt

@@ -48,6 +48,7 @@ set(PRJ_HEADERS
     include/TScopedTimer.h
     include/TServer.h
     include/VehicleData.h
+    include/Update.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/Update.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)

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

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 and Windows. In terms of actual build support, for now we usually only distribute Windows binaries and Linux. For any other distro or OS, you just have to find the same libraries listed in [Runtime Dependencies](#runtime-dependencies) further down the page, and it should build fine.
 
 Recommended compilers: MSVC, GCC, CLANG. 
 
@@ -51,128 +50,35 @@ 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)).
+For Debian, Ubuntu and others you can find scripts that do this in `scripts/`.
 
-### 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
+The names of each package may change depending on your platform. See in `scripts/` or use a search engine to find out what they're called for you.
 
-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).
+You can build on **Windows, Linux** or other platforms by following these steps:
 
-##### Runtime Dependencies
+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 -t BeamMP-Server`.
+5. Your executable can be found in `bin/`.
+
+When you make changes to the code, you only have to run step 4 again.
+
+### Runtime Dependencies
 
 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. 

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, 0 };
 };
 
+void SplitString(std::string const& str, const char delim, std::vector<std::string>& out);
+
 std::string ThreadName(bool DebugModeOverride = false);
 void RegisterThread(const std::string& str);
 #define RegisterThreadAuto() RegisterThread(__func__)

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

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;

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

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;

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

include/TPPSMonitor.h

@@ -9,6 +9,7 @@ class TNetwork;
 class TPPSMonitor : public IThreaded {
 public:
     explicit TPPSMonitor(TServer& Server);
+    virtual ~TPPSMonitor() {}
 
     void operator()() override;
 

include/Update.h

@@ -0,0 +1,9 @@
+#pragma once
+
+#include <string>
+
+namespace Update {
+
+[[noreturn]] void PerformUpdate(const std::string& InvokedAs);
+
+}

scripts/debian-11/2-configure.sh

@@ -2,4 +2,4 @@
 
 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
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,--build-id=none -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON

scripts/debian-11/3-build.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

scripts/ubuntu-22.04/2-configure.sh

@@ -2,4 +2,4 @@
 
 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
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,--build-id=none -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON

scripts/ubuntu-22.04/3-build.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

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

src/Client.cpp

@@ -51,7 +51,7 @@ 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) {
         return "";
     }
@@ -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) {

src/Common.cpp

@@ -348,3 +348,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));
+    }
+}

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,11 +107,15 @@ 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.");
@@ -113,20 +123,10 @@ void TConfig::FlushToFile() {
     SetComment(data["Misc"][StrSendErrors.data()].comments(), " You can turn on/off the SendErrors message you get on startup here");
     data["Misc"][StrSendErrorsMessageEnabled.data()] = Application::Settings.SendErrorsMessageEnabled;
     SetComment(data["Misc"][StrSendErrorsMessageEnabled.data()].comments(), " If SendErrors is `true`, the server will send helpful info about crashes and other issues back to the BeamMP developers. This info may include your config, who is on your server at the time of the error, and similar general information. This kind of data is vital in helping us diagnose and fix issues faster. This has no impact on server performance. You can opt-out of this system by setting this to `false`");
-    // HTTP
-    data["HTTP"][StrSSLKeyPath.data()] = Application::Settings.SSLKeyPath;
-    data["HTTP"][StrSSLCertPath.data()] = Application::Settings.SSLCertPath;
-    data["HTTP"][StrHTTPServerPort.data()] = Application::Settings.HTTPServerPort;
-    SetComment(data["HTTP"][StrHTTPServerIP.data()].comments(), " Which IP to listen on. Pick 0.0.0.0 for a public-facing server with no specific IP, and 127.0.0.1 or 'localhost' for a local server.");
-    data["HTTP"][StrHTTPServerIP.data()] = Application::Settings.HTTPServerIP;
-    data["HTTP"][StrHTTPServerUseSSL.data()] = Application::Settings.HTTPServerUseSSL;
-    SetComment(data["HTTP"][StrHTTPServerUseSSL.data()].comments(), " Recommended to have enabled for servers which face the internet. With SSL the server will serve https and requires valid key and cert files");
-    data["HTTP"][StrHTTPServerEnabled.data()] = Application::Settings.HTTPServerEnabled;
-    SetComment(data["HTTP"][StrHTTPServerEnabled.data()].comments(), " Enables the internal HTTP server");
     std::stringstream Ss;
     Ss << "# This is the BeamMP-Server config file.\n"
           "# Help & Documentation: `https://wiki.beammp.com/en/home/server-maintenance`\n"
-          "# IMPORTANT: Fill in the AuthKey with the key you got from `https://beammp.com/k/dashboard` on the left under \"Keys\"\n"
+          "# 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;
+}

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

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)

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

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

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

src/TServer.cpp

@@ -80,17 +80,6 @@ TEST_CASE("GetPidVid") {
 TServer::TServer(const std::vector<std::string_view>& Arguments) {
     beammp_info("BeamMP Server v" + Application::ServerVersionString());
     Application::SetSubsystemStatus("Server", Application::Status::Starting);
-    if (Arguments.size() > 1) {
-        Application::Settings.CustomIP = Arguments[0];
-        size_t n = std::count(Application::Settings.CustomIP.begin(), Application::Settings.CustomIP.end(), '.');
-        auto p = Application::Settings.CustomIP.find_first_not_of(".0123456789");
-        if (p != std::string::npos || n != 3 || Application::Settings.CustomIP.substr(0, 3) == "127") {
-            Application::Settings.CustomIP.clear();
-            beammp_warn("IP Specified is invalid! Ignoring");
-        } else {
-            beammp_info("server started with custom IP");
-        }
-    }
     Application::SetSubsystemStatus("Server", Application::Status::Good);
 }
 

src/Update.cpp

@@ -0,0 +1,249 @@
+#include "Update.h"
+#include "Common.h"
+#include <algorithm>
+#include <boost/predef.h>
+#include <cerrno>
+#include <cstdio>
+#include <cstdlib>
+#include <filesystem>
+#include <httplib.h>
+#include <nlohmann/json.hpp>
+
+#if defined(__linux)
+#include <unistd.h>
+#elif defined(WIN32)
+#include <windows.h>
+#endif
+
+static bool ProgressReport(uint64_t current, uint64_t total) {
+    if (current == total) {
+        fmt::print("100% ({:.2f} / {:.2f} KiB)\n", float(current) / 1024.0f, float(total) / 1024.0f);
+    }
+    if (total != 0) {
+        auto percent = (float(current) / float(total)) * 100.0f;
+        fmt::print("{:3.0f}% ({:.2f} / {:.2f} KiB)\r", percent, float(current) / 1024.0f, float(total) / 1024.0f);
+    }
+    return true;
+}
+
+void Update::PerformUpdate(const std::string& InvokedAs) {
+    using json = nlohmann::json;
+    namespace http = httplib;
+
+    constexpr auto GH = "api.github.com";
+    std::string ReleasesAPI = "/repos/BeamMP/BeamMP-Server/releases";
+
+    http::Headers APIHeaders {};
+    APIHeaders.emplace("X-GitHub-Api-Version", "2022-11-28");
+    APIHeaders.emplace("Accept", "application/vnd.github+json");
+
+    http::SSLClient c(GH);
+    c.set_read_timeout(std::chrono::seconds(30));
+
+    beammp_infof("Checking for latest release...");
+    // check if there is a new release
+    auto Res = c.Get(ReleasesAPI + "/latest", APIHeaders);
+    if (!Res || Res->status < 200 || Res->status >= 300) {
+        beammp_errorf("Failed to fetch latest release: {}", to_string(Res.error()));
+        std::exit(1);
+    }
+
+    Version NewVersion { 0, 0, 0 };
+
+    json ReleaseInfo;
+
+    try {
+        ReleaseInfo = json::parse(Res->body);
+
+        std::string TagName = ReleaseInfo["tag_name"].get<std::string>();
+        if (!TagName.starts_with("v") || std::count(TagName.begin(), TagName.end(), '.') != 2) {
+            beammp_errorf("Invalid version provided by GitHub: '{}', exiting", TagName);
+            std::exit(1);
+        }
+        TagName = TagName.substr(1);
+        auto Tag = Application::VersionStrToInts(TagName);
+        NewVersion = Version { Tag[0], Tag[1], Tag[2] };
+        beammp_infof("Latest release is v{}", NewVersion.AsString());
+    } catch (const std::exception& e) {
+        beammp_errorf("Failed to fetch latest release info from GitHub");
+        beammp_errorf("Error: {}", e.what());
+        std::exit(1);
+    }
+
+    // check if the new release is patch, minor or major
+    auto Current = Application::ServerVersion();
+
+    bool MajorOutdated = NewVersion.major > Current.major;
+    bool MinorOutdated = !MajorOutdated && Application::IsOutdated(Current, NewVersion);
+
+    if (!MajorOutdated && !MinorOutdated) {
+        beammp_infof("BeamMP-Server is already the latest version (v{})!", Current.AsString());
+        std::exit(0);
+    } else {
+        beammp_infof("New update available, updating from v{} to v{}", Current.AsString(), NewVersion.AsString());
+    }
+
+    std::string Arch = "";
+
+#if BOOST_ARCH_ARM && BOOST_ARCH_WORD_BITS == 64
+    Arch = "arm64";
+#elif BOOST_ARCH_X86_64
+    Arch = "x86_64";
+#else
+    beammp_errorf("The current architecture is not supported, please update manually.");
+    std::exit(1);
+#endif
+
+    std::string Postfix = {};
+// figure out current platform
+#if WIN32
+    beammp_infof("Current platform is Windows");
+    Postfix = ".exe";
+#elif __linux
+    beammp_infof("Current platform is Linux, checking distribution");
+    const std::string OsReleasePath = "/etc/os-release";
+
+    std::string DistroID = "";
+    std::string DistroVersion = "";
+
+    if (fs::exists(OsReleasePath)) {
+        std::ifstream OsRelease(OsReleasePath);
+        std::string Line {};
+        while (std::getline(OsRelease, Line)) {
+            if (Line.starts_with("ID=")) {
+                DistroID = Line.substr(3);
+            } else if (Line.starts_with("VERSION_ID=\"")) {
+                DistroVersion = Line.substr(strlen("VERSION_ID=\""));
+                // skip closing quote
+                DistroVersion = DistroVersion.substr(0, DistroVersion.size() - 1);
+            } else if (Line.starts_with("VERSION_ID=")) {
+                DistroVersion = Line.substr(strlen("VERSION_ID="));
+            }
+        }
+    }
+    beammp_infof("Distribution: {} {}", DistroID, DistroVersion);
+
+    std::string Distro = {};
+    if (DistroVersion.empty()) {
+        Distro = DistroID;
+    } else {
+        Distro = DistroID + "." + DistroVersion;
+    }
+
+    Postfix = fmt::format(".{}.{}", Distro, Arch);
+#else
+    beammp_infof("BeamMP doesn't provide binaries for this OS, please update manually");
+    std::exit(1);
+#endif
+
+    beammp_infof("Looking for BeamMP-Server{}", Postfix);
+
+    // check if the release exists for that platform
+    std::string DownloadURL = "";
+    try {
+        for (const auto& Asset : ReleaseInfo.at("assets")) {
+            if (Asset.at("name").get<std::string>() == "BeamMP-Server" + Postfix) {
+                DownloadURL = Asset.at("browser_download_url");
+                break;
+            }
+        }
+    } catch (const std::exception& e) {
+        beammp_errorf("Failed to parse GitHub API's release assets: {}", e.what());
+        std::exit(1);
+    }
+    if (DownloadURL.empty()) {
+        beammp_infof("BeamMP doesn't provide binaries for this platform or distribution (release 'BeamMP-Server{}' not found in the release assets), please update manually", Postfix);
+        std::exit(1);
+    }
+
+    // download urls exist, ask if the user wants to do a major update
+    if (MajorOutdated) {
+        beammp_warnf("The update from v{} to v{} is a major update, which is likely to *break* any Lua Plugins. Please make sure you have read the release notes at {} before proceeding!", Current.AsString(), NewVersion.AsString(), ReleaseInfo.at("html_url").get<std::string>());
+#if !defined(WIN32)
+        if (!isatty(STDIN_FILENO)) {
+            beammp_errorf("Refusing to do a major version update non-interactively. Run this again in a TTY or update manually");
+            std::exit(1);
+        }
+#endif
+        fmt::print("\n");
+        int ch;
+        do {
+            fmt::print("Do you wish to proceed with this update? [y/n] ");
+            std::string Input;
+            std::getline(std::cin, Input);
+            if (Input.empty()) {
+                continue;
+            }
+            ch = Input.at(0);
+        } while (tolower(ch) != 'y' && tolower(ch) != 'n');
+        if (tolower(ch) == 'n') {
+            beammp_error("Cancelling update");
+            std::exit(2);
+        }
+    }
+
+    beammp_info("Downloading latest release from github.com...");
+
+    http::SSLClient DlClient("github.com");
+    DlClient.set_follow_location(true);
+    auto ReleaseRes = DlClient.Get(DownloadURL.substr(strlen("https://github.com")), ProgressReport);
+
+    if (!ReleaseRes || ReleaseRes->status < 200 || ReleaseRes->status >= 300) {
+        beammp_errorf("Failed to fetch binary: {}. Please update manually", to_string(ReleaseRes.error()));
+        std::exit(1);
+    }
+
+    beammp_info("Download complete!");
+
+    auto Temp = InvokedAs + ".temp";
+    beammp_infof("Creating '{}'", Temp);
+    FILE* Out = std::fopen(Temp.c_str(), "w+");
+    if (!Out) {
+        beammp_errorf("Failed to update executable, because a temporary file couldn't be created: {}", std::strerror(errno));
+        std::exit(1);
+    }
+    auto n = std::fwrite(ReleaseRes->body.data(), 1, ReleaseRes->body.size(), Out);
+    if (n != ReleaseRes->body.size()) {
+        beammp_errorf("Failed to update executable, because a temporary file couldn't be written to: {}", std::strerror(errno));
+        std::fclose(Out);
+        std::exit(1);
+    }
+    std::fclose(Out);
+
+#if defined(__linux)
+    beammp_infof("Removing '{}'", InvokedAs);
+    struct stat st;
+    if (stat(InvokedAs.c_str(), &st) != 0) {
+        // shouldn't happen at this point
+        beammp_errorf("Failed to stat original executable: {}", std::strerror(errno));
+        std::exit(1);
+    }
+    auto Ret = unlink(InvokedAs.c_str());
+    if (Ret != 0) {
+        beammp_errorf("Failed to remove executable: {}", std::strerror(errno));
+        std::exit(1);
+    }
+    beammp_infof("Replacing '{}' with '{}'", InvokedAs, Temp);
+    fs::rename(Temp, InvokedAs);
+    if (chmod(InvokedAs.c_str(), st.st_mode) != 0) {
+        beammp_warnf("Failed to set file mode to 0{:o}: {}. File may not be executable.", st.st_mode, std::strerror(errno));
+    }
+#elif defined(WIN32)
+    auto DeleteMe = InvokedAs + ".delete_me";
+    std::filesystem::rename(InvokedAs, DeleteMe);
+    std::filesystem::rename(Temp, InvokedAs);
+    int Attr = GetFileAttributesA(DeleteMe.c_str());
+    if ((Attr & FILE_ATTRIBUTE_HIDDEN) == 0) {
+        SetFileAttributesA(DeleteMe.c_str(), Attr | FILE_ATTRIBUTE_HIDDEN);
+    }
+#else
+    beammp_error("Not implemented");
+    std::exit(4);
+#endif
+
+    // make sure the user knows that it was a success, on windows wait for return???
+
+    beammp_infof("SUCCESSFULLY UPDATED to v{}. Please launch the server manually to start the new version!", NewVersion.AsString());
+
+    std::exit(0);
+}

src/main.cpp

@@ -11,7 +11,9 @@
 #include "TPluginMonitor.h"
 #include "TResourceManager.h"
 #include "TServer.h"
+#include "Update.h"
 
+#include <filesystem>
 #include <iostream>
 #include <thread>
 
@@ -33,6 +35,9 @@ ARGUMENTS:
                         including the path given in --config.
     --version
                         Prints version info and exits.
+    --update
+                        Starts an interactive update to the newest 
+                        version of BeamMP-Server.
 
 EXAMPLES:
     BeamMP-Server --config=../MyWestCoastServerConfig.toml
@@ -69,10 +74,10 @@ 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);
+    Parser.RegisterArgument({ "update" }, ArgsParser::NONE);
     Parser.RegisterArgument({ "config" }, ArgsParser::HAS_VALUE);
     Parser.RegisterArgument({ "working-directory" }, ArgsParser::HAS_VALUE);
     Parser.Parse(Arguments.List);
@@ -80,15 +85,22 @@ 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;
     }
+    if (Parser.FoundArgument({ "update" })) {
+        Update::PerformUpdate(Arguments.InvokedAs);
+        return 123;
+    }
+    // check that there is no old update file
+    auto OldFile = Arguments.InvokedAs + ".delete_me";
+    if (fs::exists(OldFile)) {
+        fs::remove(OldFile);
+    }
 
     std::string ConfigPath = "ServerConfig.toml";
     if (Parser.FoundArgument({ "config" })) {
@@ -109,11 +121,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 +151,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");