start implementing ipv6 support, of course it all sucks

so time to rewrite 90% of it fucking kill me

.clang-format

@@ -0,0 +1,5 @@
+---
+BasedOnStyle: WebKit
+BreakBeforeBraces: Attach
+SpaceAfterTemplateKeyword: false
+...

.github/workflows/cmake-linux.yml

@@ -13,6 +13,14 @@ jobs:
       - uses: actions/checkout@v2
         with:
             submodules: 'true'
+      
+      - name: Restore artifacts, or run vcpkg, build and cache artifacts
+        uses: lukka/run-vcpkg@v7
+        id: runvcpkg
+        with:
+            vcpkgArguments: 'zlib nlohmann-json openssl cpp-httplib[openssl]'
+            vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
+            vcpkgGitCommitId: '40616a5e954f7be1077ef37db3fbddbd5dcd1ca6'
 
       - name: Create Build Environment
         run: cmake -E make_directory ${{github.workspace}}/build-linux
@@ -20,7 +28,7 @@ jobs:
       - name: Configure CMake
         shell: bash
         working-directory: ${{github.workspace}}/build-linux
-        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE='${{ runner.workspace }}/b/vcpkg/scripts/buildsystems/vcpkg.cmake'
 
       - name: Build
         working-directory: ${{github.workspace}}/build-linux

.github/workflows/cmake-windows.yml

@@ -18,9 +18,9 @@ jobs:
         uses: lukka/run-vcpkg@v7
         id: runvcpkg
         with:
-            vcpkgArguments: 'discord-rpc zlib rapidjson openssl'
+            vcpkgArguments: 'discord-rpc zlib nlohmann-json openssl cpp-httplib[openssl]'
             vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
-            vcpkgGitCommitId: '06b5f4a769d848d1a20fa0acd556019728b56273'
+            vcpkgGitCommitId: '40616a5e954f7be1077ef37db3fbddbd5dcd1ca6'
             vcpkgTriplet: 'x64-windows-static'
 
       - name: Create Build Environment

.github/workflows/release-build.yml

@@ -43,9 +43,9 @@ jobs:
         uses: lukka/run-vcpkg@main
         id: runvcpkg
         with:
-            vcpkgArguments: 'discord-rpc zlib rapidjson openssl'
+            vcpkgArguments: 'discord-rpc zlib nlohmann-json openssl cpp-httplib[openssl]'
             vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
-            vcpkgGitCommitId: '06b5f4a769d848d1a20fa0acd556019728b56273'
+            vcpkgGitCommitId: '16ee2ecb31788c336ace8bb14c21801efb6836e4'
             vcpkgTriplet: 'x64-windows-static'
 
       - name: Create Build Environment

.gitignore

@@ -4,4 +4,11 @@ cmake-build-release
 *.log
 /*.sh
 /*.obj
-/*.exe
+/*.exe
+.cache/
+.https_debug/
+Launcher.cfg
+Resources/
+bin/
+compile_commands.json
+key

CMakeLists.txt

@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 3.10)
+
 project(Launcher)
 
 if (WIN32)
@@ -7,11 +8,15 @@ if (WIN32)
     STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
 endif(WIN32)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
 
 file(GLOB source_files "src/*.cpp" "src/*/*.cpp" "src/*/*.hpp" "include/*.h"  "include/*/*.h" "include/*/*/*.h" "include/*.hpp"  "include/*/*.hpp" "include/*/*/*.hpp")
+find_package(httplib CONFIG REQUIRED)
+find_package(nlohmann_json CONFIG REQUIRED)
+find_package(asio CONFIG REQUIRED)
+find_package(fmt CONFIG REQUIRED)
 
 add_executable(${PROJECT_NAME} ${source_files})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "BeamMP-Launcher")
@@ -19,20 +24,16 @@ set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "BeamMP-Launcher")
 if (WIN32)
     find_package(ZLIB REQUIRED)
     find_package(OpenSSL REQUIRED)
-    #-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static
+    target_link_libraries(${PROJECT_NAME} PRIVATE
-    set(VcpkgRoot ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET})
+            ZLIB::ZLIB OpenSSL::SSL OpenSSL::Crypto ws2_32 httplib::httplib nlohmann_json::nlohmann_json asio::asio fmt::fmt)
-    include_directories(${VcpkgRoot}/include)
-    link_directories(${VcpkgRoot}/lib)
-    target_link_libraries(${PROJECT_NAME} PRIVATE ${VcpkgRoot}/lib/discord-rpc.lib
-            ZLIB::ZLIB OpenSSL::SSL OpenSSL::Crypto ws2_32)
 elseif (LINUX)
     find_package(ZLIB REQUIRED)
     find_package(OpenSSL REQUIRED)
     target_link_libraries(${PROJECT_NAME} PRIVATE 
-            ZLIB::ZLIB OpenSSL::SSL OpenSSL::Crypto)
+            ZLIB::ZLIB OpenSSL::SSL OpenSSL::Crypto asio::asio fmt::fmt)
-else(WIN32) #MINGW
+elseif (WIN32) #MINGW
     add_definitions("-D_WIN32_WINNT=0x0600")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Os -s --static")
-    target_link_libraries(${PROJECT_NAME} discord-rpc ssl crypto ws2_32 ssp crypt32 z)
+    target_link_libraries(${PROJECT_NAME} ssl crypto ws2_32 ssp crypt32 z asio::asio fmt::fmt)
 endif(WIN32)
-target_include_directories(${PROJECT_NAME} PRIVATE "include")
+target_include_directories(${PROJECT_NAME} PRIVATE "include")

README.md

@@ -2,6 +2,10 @@
 
 The launcher is the way we communitcate to outside the game, it does a few automated actions such as but not limited to: downloading the mod, launching the game, and create a connection to a server.
 
+## How to build
+
+1. `cmake . -B bin -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static`
+2. `cmake --build bin --parallel`
 
 Copyright (c) 2019-present Anonymous275.
 BeamMP Launcher code is not in the public domain and is not free software.

include/Discord/discord_info.h

@@ -1,15 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Launcher code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 7/16/2020
-///
-#pragma once
-#include <string>
-void Discord_Main();
-std::string GetDName();
-std::string GetDTag();
-std::string GetDID();
-void DAboard();
-

include/Discord/discord_register.h

@@ -1,26 +0,0 @@
-#pragma once
-
-#if defined(DISCORD_DYNAMIC_LIB)
-#if defined(_WIN32)
-#if defined(DISCORD_BUILDING_SDK)
-#define DISCORD_EXPORT __declspec(dllexport)
-#else
-#define DISCORD_EXPORT __declspec(dllimport)
-#endif
-#else
-#define DISCORD_EXPORT __attribute__((visibility("default")))
-#endif
-#else
-#define DISCORD_EXPORT
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-DISCORD_EXPORT void Discord_Register(const char* applicationId, const char* command);
-DISCORD_EXPORT void Discord_RegisterSteamGame(const char* applicationId, const char* steamId);
-
-#ifdef __cplusplus
-}
-#endif

include/Discord/discord_rpc.h

@@ -1,87 +0,0 @@
-#pragma once
-#include <cstdint>
-
-// clang-format off
-
-#if defined(DISCORD_DYNAMIC_LIB)
-#  if defined(_WIN32)
-#    if defined(DISCORD_BUILDING_SDK)
-#      define DISCORD_EXPORT __declspec(dllexport)
-#    else
-#      define DISCORD_EXPORT __declspec(dllimport)
-#    endif
-#  else
-#    define DISCORD_EXPORT __attribute__((visibility("default")))
-#  endif
-#else
-#  define DISCORD_EXPORT
-#endif
-
-// clang-format on
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct DiscordRichPresence {
-    const char* state;   /* max 128 bytes */
-    const char* details; /* max 128 bytes */
-    int64_t startTimestamp;
-    int64_t endTimestamp;
-    const char* largeImageKey;  /* max 32 bytes */
-    const char* largeImageText; /* max 128 bytes */
-    const char* smallImageKey;  /* max 32 bytes */
-    const char* smallImageText; /* max 128 bytes */
-    const char* partyId;        /* max 128 bytes */
-    int partySize;
-    int partyMax;
-    const char* matchSecret;    /* max 128 bytes */
-    const char* joinSecret;     /* max 128 bytes */
-    const char* spectateSecret; /* max 128 bytes */
-    int8_t instance;
-} DiscordRichPresence;
-
-typedef struct DiscordUser {
-    const char* userId;
-    const char* username;
-    const char* discriminator;
-    const char* avatar;
-} DiscordUser;
-
-typedef struct DiscordEventHandlers {
-    void (*ready)(const DiscordUser* request);
-    void (*disconnected)(int errorCode, const char* message);
-    void (*errored)(int errorCode, const char* message);
-    void (*joinGame)(const char* joinSecret);
-    void (*spectateGame)(const char* spectateSecret);
-    void (*joinRequest)(const DiscordUser* request);
-} DiscordEventHandlers;
-
-#define DISCORD_REPLY_NO 0
-#define DISCORD_REPLY_YES 1
-#define DISCORD_REPLY_IGNORE 2
-
-DISCORD_EXPORT void Discord_Initialize(const char* applicationId,
-                                       DiscordEventHandlers* handlers,
-                                       int autoRegister,
-                                       const char* optionalSteamId);
-DISCORD_EXPORT void Discord_Shutdown(void);
-
-/* checks for incoming messages, dispatches callbacks */
-DISCORD_EXPORT void Discord_RunCallbacks(void);
-
-/* If you disable the lib starting its own io thread, you'll need to call this from your own */
-#ifdef DISCORD_DISABLE_IO_THREAD
-DISCORD_EXPORT void Discord_UpdateConnection(void);
-#endif
-
-DISCORD_EXPORT void Discord_UpdatePresence(const DiscordRichPresence* presence);
-DISCORD_EXPORT void Discord_ClearPresence(void);
-
-DISCORD_EXPORT void Discord_Respond(const char* userid, /* DISCORD_REPLY_ */ int reply);
-
-DISCORD_EXPORT void Discord_UpdateHandlers(DiscordEventHandlers* handlers);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif

include/Helpers.h

@@ -0,0 +1,11 @@
+#include <span>
+#include <string>
+#include <vector>
+
+#pragma once
+
+using ByteSpan = std::span<const char>;
+
+std::string bytespan_to_string(ByteSpan span);
+
+std::vector<char> strtovec(std::string_view str);

include/Http.h

@@ -6,15 +6,15 @@
 /// Created by Anonymous275 on 7/18/2020
 ///
 #pragma once
-#include <string>
 #include "Logger.h"
+#include <string>
 class HTTP {
 public:
-    static bool Download(const std::string &IP, const std::string &Path);
+    static bool Download(const std::string& IP, const std::string& Path);
     static std::string Post(const std::string& IP, const std::string& Fields);
-    static std::string Get(const std::string &IP);
+    static std::string Get(const std::string& IP);
     static bool ProgressBar(size_t c, size_t t);
+
 public:
     static bool isDownload;
-    static std::string Codes_[];
 };

include/Json.h

@@ -1,12 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Launcher code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 11/27/2020
-///
-#pragma once
-#include "rapidjson/stringbuffer.h"
-#include "rapidjson/document.h"
-#include "rapidjson/writer.h"
-namespace json = rapidjson;

include/Logger.h

@@ -6,8 +6,8 @@
 /// Created by Anonymous275 on 4/2/2020.
 ///
 #pragma once
-#include <string>
 #include <iostream>
+#include <string>
 void InitLog();
 void except(const std::string& toPrint);
 void fatal(const std::string& toPrint);
@@ -15,3 +15,4 @@ void debug(const std::string& toPrint);
 void error(const std::string& toPrint);
 void info(const std::string& toPrint);
 void warn(const std::string& toPrint);
+std::string getDate();

include/Network/network.hpp

@@ -6,51 +6,61 @@
 /// Created by Anonymous275 on 7/18/2020
 ///
 
-
 #pragma once
+#include "Helpers.h"
+#include "asio/io_context.hpp"
+#include "asio/ip/address.hpp"
+#include <span>
 #include <string>
 
 #ifdef __linux__
-#include <cstdint>
 #include "linuxfixes.h"
 #include <bits/types/siginfo_t.h>
+#include <cstdint>
 #include <sys/ucontext.h>
+#include <vector>
 #endif
 
+#include <asio.hpp>
 
+extern asio::io_context io;
 
 void NetReset();
 extern bool Dev;
 extern int ping;
 
 [[noreturn]] void CoreNetwork();
+extern int ProxyPort;
 extern int ClientID;
 extern int LastPort;
 extern bool ModLoaded;
 extern bool Terminate;
 extern int DEFAULT_PORT;
-extern uint64_t UDPSock;
+extern std::shared_ptr<asio::ip::udp::socket> UDPSock;
-extern uint64_t TCPSock;
+extern std::shared_ptr<asio::ip::tcp::socket> TCPSock;
 extern std::string Branch;
 extern bool TCPTerminate;
 extern std::string LastIP;
 extern std::string MStatus;
 extern std::string UlStatus;
 extern std::string PublicKey;
+extern std::string PrivateKey;
 extern std::string ListOfMods;
-int KillSocket(uint64_t Dead);
+void KillSocket(std::shared_ptr<asio::ip::tcp::socket>& Dead);
+void KillSocket(std::shared_ptr<asio::ip::udp::socket>& Dead);
+void KillSocket(asio::ip::tcp::socket& Dead);
+void KillSocket(asio::ip::udp::socket& Dead);
 void UUl(const std::string& R);
-void UDPSend(std::string Data);
+void UDPSend(const std::vector<char>& Data);
 bool CheckBytes(int32_t Bytes);
-void GameSend(std::string Data);
+void GameSend(std::string_view Data);
-void SendLarge(std::string Data);
+void SendLarge(const std::vector<char>& Data);
-std::string TCPRcv(uint64_t Sock);
+std::string TCPRcv(asio::ip::tcp::socket& Sock);
-void SyncResources(uint64_t TCPSock);
+void SyncResources(asio::ip::tcp::socket& TCPSock);
-std::string GetAddr(const std::string&IP);
+std::string GetAddr(const std::string& IP);
-void ServerParser(const std::string& Data);
+void ServerParser(std::string_view Data);
 std::string Login(const std::string& fields);
-void TCPSend(const std::string&Data,uint64_t Sock);
+void TCPSend(const std::vector<char>& Data, asio::ip::tcp::socket& Sock);
-void TCPClientMain(const std::string& IP,int Port);
+void TCPClientMain(asio::ip::tcp::socket&& Socket);
-void UDPClientMain(const std::string& IP,int Port);
+void UDPClientMain(asio::ip::address addr, uint16_t port);
-void TCPGameServer(const std::string& IP, int Port);
+void TCPGameServer(asio::ip::tcp::socket&& Socket);
-

include/NetworkHelpers.h

@@ -0,0 +1,6 @@
+#pragma once
+
+#include <asio.hpp>
+#include <vector>
+
+void ReceiveFromGame(asio::ip::tcp::socket& socket, std::vector<char>& out_data);

include/Security/Init.h

@@ -8,7 +8,7 @@
 #pragma once
 #include <string>
 void PreGame(const std::string& GamePath);
-std::string CheckVer(const std::string &path);
+std::string CheckVer(const std::string& path);
 void InitGame(const std::string& Dir);
 std::string GetGameDir();
 void LegitimacyCheck();

include/Startup.h

@@ -6,11 +6,16 @@
 /// Created by Anonymous275 on 7/18/2020
 ///
 #pragma once
+#include <compare>
 #include <string>
+#include <vector>
+
 void InitLauncher(int argc, char* argv[]);
-std::string GetEP(char*P = nullptr);
+std::string GetEP(char* P = nullptr);
 std::string GetGamePath();
 std::string GetVer();
 std::string GetEN();
+void StartProxy();
 void ConfigInit();
-extern bool Dev;
+extern bool Dev;
+

include/Zlib/Compressor.h

@@ -6,6 +6,8 @@
 /// Created by Anonymous275 on 7/24/2020
 ///
 #pragma once
-#include <string>
+#include <span>
-std::string Comp(std::string Data);
+#include <vector>
-std::string DeComp(std::string Compressed);
+
+std::vector<char> Comp(std::span<const char> input);
+std::vector<char> DeComp(std::span<const char> input);

include/linuxfixes.h

@@ -11,7 +11,7 @@
 #define closesocket close
 #define SD_BOTH SHUT_RDWR
 // We dont need wsacleanup
-#define WSACleanup() 
+#define WSACleanup()
 #define SOCKET_ERROR -1
 
 #define ZeroMemory(mem, len) memset(mem, 0, len)

src/Compressor.cpp

@@ -6,52 +6,58 @@
 /// Created by Anonymous275 on 7/15/2020
 ///
 
-#include <iostream>
+#include "Logger.h"
+#include <span>
+#include <vector>
+#include <zconf.h>
 #include <zlib.h>
 #ifdef __linux__
 #include <cstring>
 #endif
 
-#define Biggest 30000
+std::vector<char> Comp(std::span<const char> input) {
-std::string Comp(std::string Data){
+    auto max_size = compressBound(input.size());
-    char*C = new char[Biggest];
+    std::vector<char> output(max_size);
-    memset(C, 0, Biggest);
+    uLongf output_size = output.size();
-    z_stream defstream;
+    int res = compress2(
-    defstream.zalloc = Z_NULL;
+        reinterpret_cast<Bytef*>(output.data()),
-    defstream.zfree = Z_NULL;
+        &output_size,
-    defstream.opaque = Z_NULL;
+        reinterpret_cast<const Bytef*>(input.data()),
-    defstream.avail_in = (uInt)Data.length();
+        static_cast<uLongf>(input.size()),
-    defstream.next_in = (Bytef *)&Data[0];
+        3);
-    defstream.avail_out = Biggest;
+    if (res != Z_OK) {
-    defstream.next_out = reinterpret_cast<Bytef *>(C);
+        error("zlib compress() failed: " + std::to_string(res));
-    deflateInit(&defstream, Z_BEST_COMPRESSION);
+        throw std::runtime_error("zlib compress() failed");
-    deflate(&defstream, Z_SYNC_FLUSH);
+    }
-    deflate(&defstream, Z_FINISH);
+    debug("zlib compressed " + std::to_string(input.size()) + " B to " + std::to_string(output_size) + " B");
-    deflateEnd(&defstream);
+    output.resize(output_size);
-    int TO = defstream.total_out;
+    return output;
-    std::string Ret(TO,0);
+}
-    memcpy(&Ret[0],C,TO);
+
-    delete [] C;
+std::vector<char> DeComp(std::span<const char> input) {
-    return Ret;
+    std::vector<char> output_buffer(std::min<size_t>(input.size() * 5, 15 * 1024 * 1024));
+
+    uLongf output_size = output_buffer.size();
+
+    while (true) {
+        int res = uncompress(
+            reinterpret_cast<Bytef*>(output_buffer.data()),
+            &output_size,
+            reinterpret_cast<const Bytef*>(input.data()),
+            static_cast<uLongf>(input.size()));
+        if (res == Z_BUF_ERROR) {
+            if (output_buffer.size() > 30 * 1024 * 1024) {
+                throw std::runtime_error("decompressed packet size of 30 MB exceeded");
+            }
+            debug("zlib uncompress() failed, trying with 2x buffer size of " + std::to_string(output_buffer.size() * 2));
+            output_buffer.resize(output_buffer.size() * 2);
+            output_size = output_buffer.size();
+        } else if (res != Z_OK) {
+            error("zlib uncompress() failed: " + std::to_string(res));
+            throw std::runtime_error("zlib uncompress() failed");
+        } else if (res == Z_OK) {
+            break;
+        }
+    }    output_buffer.resize(output_size);
+    return output_buffer;
 }
-std::string DeComp(std::string Compressed){
-    char*C = new char[Biggest];
-    memset(C, 0, Biggest);
-    z_stream infstream;
-    infstream.zalloc = Z_NULL;
-    infstream.zfree = Z_NULL;
-    infstream.opaque = Z_NULL;
-    infstream.avail_in = Biggest;
-    infstream.next_in = (Bytef *)(&Compressed[0]);
-    infstream.avail_out = Biggest;
-    infstream.next_out = (Bytef *)(C);
-    inflateInit(&infstream);
-    inflate(&infstream, Z_SYNC_FLUSH);
-    inflate(&infstream, Z_FINISH);
-    inflateEnd(&infstream);
-    int TO = infstream.total_out;
-    std::string Ret(TO,0);
-    memcpy(&Ret[0],C,TO);
-    delete [] C;
-    return Ret;
-}

src/Config.cpp

@@ -1,59 +1,59 @@
-///
+///
-/// Created by Anonymous275 on 2/23/2021
+/// Created by Anonymous275 on 2/23/2021
-///
+///
-
+
-#include "Network/network.hpp"
+#include "Logger.h"
-#include <filesystem>
+#include "Network/network.hpp"
-#include "Logger.h"
+#include <cstdint>
-#include <fstream>
+#include <filesystem>
-#include "Json.h"
+#include <fstream>
-#include <cstdint>
+#include <nlohmann/json.hpp>
-namespace fs = std::filesystem;
+namespace fs = std::filesystem;
-
+
-std::string Branch;
+std::string Branch;
-void ParseConfig(const json::Document& d){
+void ParseConfig(const nlohmann::json& d) {
-    if(d["Port"].IsInt()){
+    if (d["Port"].is_number()) {
-        DEFAULT_PORT = d["Port"].GetInt();
+        DEFAULT_PORT = d["Port"].get<int>();
-    }
+    }
-    //Default -1
+    // Default -1
-    //Release 1
+    // Release 1
-    //EA 2
+    // EA 2
-    //Dev 3
+    // Dev 3
-    //Custom 3
+    // Custom 3
-
+
-    if(d["Build"].IsString()){
+    if (d["Build"].is_string()) {
-        Branch = d["Build"].GetString();
+        Branch = d["Build"].get<std::string>();
-        for(char& c : Branch)c = char(tolower(c));
+        for (char& c : Branch)
-    }
+            c = char(tolower(c));
-}
+    }
-
+}
-void ConfigInit(){
+
-    if(fs::exists("Launcher.cfg")){
+void ConfigInit() {
-        std::ifstream cfg("Launcher.cfg");
+    if (fs::exists("Launcher.cfg")) {
-        if(cfg.is_open()){
+        std::ifstream cfg("Launcher.cfg");
-            auto Size = fs::file_size("Launcher.cfg");
+        if (cfg.is_open()) {
-            std::string Buffer(Size, 0);
+            auto Size = fs::file_size("Launcher.cfg");
-            cfg.read(&Buffer[0], Size);
+            std::string Buffer(Size, 0);
-            cfg.close();
+            cfg.read(&Buffer[0], Size);
-            json::Document d;
+            cfg.close();
-            d.Parse(Buffer.c_str());
+            nlohmann::json d = nlohmann::json::parse(Buffer, nullptr, false);
-            if(d.HasParseError()){
+            if (d.is_discarded()) {
-                fatal("Config failed to parse make sure it's valid JSON! Code : " + std::to_string(d.GetParseError()));
+                fatal("Config failed to parse make sure it's valid JSON!");
-            }
+            }
-            ParseConfig(d);
+            ParseConfig(d);
-        }else fatal("Failed to open Launcher.cfg!");
+        } else
-    }else{
+            fatal("Failed to open Launcher.cfg!");
-        std::ofstream cfg("Launcher.cfg");
+    } else {
-        if(cfg.is_open()){
+        std::ofstream cfg("Launcher.cfg");
-            cfg <<
+        if (cfg.is_open()) {
-            R"({
+            cfg <<
-"Port": 4444,
+                R"({
-"Build": "Default"
+    "Port": 4444,
-})";
+    "Build": "Default"
-            cfg.close();
+})";
-        }else{
+            cfg.close();
-            fatal("Failed to write config on disk!");
+        } else {
-        }
+            fatal("Failed to write config on disk!");
-    }
+        }
-}
+    }
-
+}

src/Discord.cpp

@@ -1,116 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Launcher code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 7/16/2020
-///
-
-#ifndef __linux__
-
-#include "Discord/discord_rpc.h"
-#include "Logger.h"
-#include <cstring>
-#include <thread>
-#include <ctime>
-
-struct DInfo{
-    std::string Name;
-    std::string Tag;
-    std::string DID;
-};
-DInfo* DiscordInfo = nullptr;
-int64_t StartTime;
-void updateDiscordPresence(){
-    //if (SendPresence) {
-    //char buffer[256];
-    DiscordRichPresence discordPresence;
-    memset(&discordPresence, 0, sizeof(discordPresence));
-    std::string P = "Playing with friends!"; ///to be revisited
-    discordPresence.state = P.c_str();
-    //sprintf(buffer, "Frustration level: %d", FrustrationLevel);
-    //discordPresence.details = buffer;
-    discordPresence.startTimestamp = StartTime;
-    //discordPresence.endTimestamp = time(0) + 5 * 60;
-
-    discordPresence.largeImageKey = "mainlogo";
-    //discordPresence.smallImageKey = "logo";
-    //discordPresence.partyId = "party1234";
-    //discordPresence.partySize = 1;
-    //discordPresence.partyMax = 6;
-    //discordPresence.matchSecret = "xyzzy";
-    //discordPresence.joinSecret = "join";
-    //discordPresence.spectateSecret = "look";
-    //discordPresence.instance = 0;
-    Discord_UpdatePresence(&discordPresence);
-    //}
-    //else {
-    // Discord_ClearPresence();
-    //}
-}
-void handleDiscordReady(const DiscordUser* User){
-    DiscordInfo = new DInfo{
-        User->username,
-        User->discriminator,
-        User->userId
-    };
-}
-void discordInit(){
-    DiscordEventHandlers handlers;
-    memset(&handlers, 0, sizeof(handlers));
-    handlers.ready = handleDiscordReady;
-    /*handlers.disconnected = handleDiscordDisconnected;
-    handlers.errored = handleDiscordError;
-    handlers.joinGame = handleDiscordJoin;
-    handlers.spectateGame = handleDiscordSpectate;
-    handlers.joinRequest = handleDiscordJoinRequest;*/
-    Discord_Initialize("629743237988352010", &handlers, 1,nullptr);
-}
-[[noreturn]] void Loop(){
-    StartTime = time(nullptr);
-    while (true) {
-        updateDiscordPresence();
-        #ifdef DISCORD_DISABLE_IO_THREAD
-            Discord_UpdateConnection();
-        #endif
-        Discord_RunCallbacks();
-        if(DiscordInfo == nullptr){
-            std::this_thread::sleep_for(std::chrono::milliseconds(250));
-        }else std::this_thread::sleep_for(std::chrono::seconds(2));
-    }
-}
-
-void DMain(){
-    discordInit();
-    Loop();
-}
-std::string GetDName(){
-    return DiscordInfo->Name;
-}
-std::string GetDTag(){
-    return DiscordInfo->Tag;
-}
-std::string GetDID(){
-    return DiscordInfo->DID;
-}
-void DAboard(){
-    DiscordInfo = nullptr;
-}
-void ErrorAboard(){
-    error("Discord timeout! please start the discord app and try again after 30 secs");
-    std::this_thread::sleep_for(std::chrono::seconds(5));
-    exit(6);
-}
-void Discord_Main(){
-    /*std::thread t1(DMain);
-    t1.detach();*/
-    /*info("Connecting to discord client...");
-    int C = 0;
-    while(DiscordInfo == nullptr && C < 80){
-        std::this_thread::sleep_for(std::chrono::milliseconds(300));
-        C++;
-    }
-    if(DiscordInfo == nullptr)ErrorAboard();*/
-}
-
-#endif

src/GameStart.cpp

@@ -6,83 +6,85 @@
 /// Created by Anonymous275 on 7/19/2020
 ///
 
-
 #if defined(_WIN32)
 #include <windows.h>
 #elif defined(__linux__)
 #include "vdf_parser.hpp"
+#include <cerrno>
+#include <cstring>
 #include <pwd.h>
-#include <sys/wait.h>
-#include <sys/types.h>
-#include <unistd.h>
 #include <spawn.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
 #endif
 
+#include "Logger.h"
+#include "Startup.h"
 #include <Security/Init.h>
 #include <filesystem>
-#include "Startup.h"
-#include "Logger.h"
 #include <thread>
 
 unsigned long GamePID = 0;
 #if defined(_WIN32)
-std::string QueryKey(HKEY hKey,int ID);
+std::string QueryKey(HKEY hKey, int ID);
-std::string GetGamePath(){
+std::string GetGamePath() {
     static std::string Path;
-    if(!Path.empty())return Path;
+    if (!Path.empty())
+        return Path;
 
     HKEY hKey;
     LPCTSTR sk = "Software\\BeamNG\\BeamNG.drive";
     LONG openRes = RegOpenKeyEx(HKEY_CURRENT_USER, sk, 0, KEY_ALL_ACCESS, &hKey);
-    if (openRes != ERROR_SUCCESS){
+    if (openRes != ERROR_SUCCESS) {
         fatal("Please launch the game at least once!");
     }
-    Path = QueryKey(hKey,4);
+    Path = QueryKey(hKey, 4);
 
-    if(Path.empty()){
+    if (Path.empty()) {
         sk = R"(SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders)";
         openRes = RegOpenKeyEx(HKEY_CURRENT_USER, sk, 0, KEY_ALL_ACCESS, &hKey);
-        if (openRes != ERROR_SUCCESS){
+        if (openRes != ERROR_SUCCESS) {
-           fatal("Cannot get Local Appdata directory!");
+            fatal("Cannot get Local Appdata directory!");
         }
-        Path = QueryKey(hKey,5);
+        Path = QueryKey(hKey, 5);
         Path += "\\BeamNG.drive\\";
     }
     std::string Ver = CheckVer(GetGameDir());
-    Ver = Ver.substr(0,Ver.find('.',Ver.find('.')+1));
+    Ver = Ver.substr(0, Ver.find('.', Ver.find('.') + 1));
     Path += Ver + "\\";
     return Path;
 }
 #elif defined(__linux__)
-std::string GetGamePath(){
+std::string GetGamePath() {
     // Right now only steam is supported
-    struct passwd *pw = getpwuid(getuid());
+    struct passwd* pw = getpwuid(getuid());
     std::string homeDir = pw->pw_dir;
-    
+
     std::string Path = homeDir + "/.local/share/BeamNG.drive/";
     std::string Ver = CheckVer(GetGameDir());
-    Ver = Ver.substr(0,Ver.find('.',Ver.find('.')+1));
+    Ver = Ver.substr(0, Ver.find('.', Ver.find('.') + 1));
     Path += Ver + "/";
     return Path;
 }
 #endif
 
 #if defined(_WIN32)
-void StartGame(std::string Dir){
+void StartGame(std::string Dir) {
     BOOL bSuccess = FALSE;
     PROCESS_INFORMATION pi;
-    STARTUPINFO si = {0};
+    STARTUPINFO si = { 0 };
     si.cb = sizeof(si);
     std::string BaseDir = Dir; //+"\\Bin64";
-    //Dir += R"(\Bin64\BeamNG.drive.x64.exe)";
+    // Dir += R"(\Bin64\BeamNG.drive.x64.exe)";
     Dir += "\\BeamNG.drive.exe";
     bSuccess = CreateProcessA(Dir.c_str(), nullptr, nullptr, nullptr, TRUE, 0, nullptr, BaseDir.c_str(), &si, &pi);
-    if (bSuccess){
+    if (bSuccess) {
         info("Game Launched!");
         GamePID = pi.dwProcessId;
         WaitForSingleObject(pi.hProcess, INFINITE);
         error("Game Closed! launcher closing soon");
-    }else{
+    } else {
         error("Failed to Launch the game! launcher closing soon");
     }
     std::this_thread::sleep_for(std::chrono::seconds(5));
@@ -90,11 +92,27 @@ void StartGame(std::string Dir){
 }
 #elif defined(__linux__)
 void StartGame(std::string Dir) {
-    int status;
     std::string filename = (Dir + "/BinLinux/BeamNG.drive.x64");
-    char *argv[] = {filename.data(), NULL};
+    char* argv[] = { filename.data(), NULL };
     pid_t pid;
-    int result = posix_spawn(&pid, filename.c_str(), NULL, NULL, argv, environ);
+
+    posix_spawn_file_actions_t file_actions;
+    auto status = posix_spawn_file_actions_init(&file_actions);
+    // disable stdout
+    if (status != 0) {
+        error(std::string("posix_spawn_file_actions_init failed: ") + std::strerror(errno));
+    }
+    status = posix_spawn_file_actions_addclose(&file_actions, STDOUT_FILENO);
+    if (status != 0) {
+        error(std::string("posix_spawn_file_actions_addclose for STDOUT failed: ") + std::strerror(errno));
+    }
+    status = posix_spawn_file_actions_addclose(&file_actions, STDERR_FILENO);
+    if (status != 0) {
+        error(std::string("posix_spawn_file_actions_addclose for STDERR failed: ") + std::strerror(errno));
+    }
+
+    // launch the game
+    int result = posix_spawn(&pid, filename.c_str(), &file_actions, NULL, argv, environ);
 
     if (result != 0) {
         error("Failed to Launch the game! launcher closing soon");
@@ -104,13 +122,18 @@ void StartGame(std::string Dir) {
         error("Game Closed! launcher closing soon");
     }
 
+    status = posix_spawn_file_actions_destroy(&file_actions);
+    if (status != 0) {
+        warn(std::string("posix_spawn_file_actions_destroy failed: ") + std::strerror(errno));
+    }
+
     std::this_thread::sleep_for(std::chrono::seconds(5));
     exit(2);
 }
 #endif
 
-void InitGame(const std::string& Dir){
+void InitGame(const std::string& Dir) {
-    if(!Dev){
+    if (!Dev) {
         std::thread Game(StartGame, Dir);
         Game.detach();
     }

src/Helpers.cpp

@@ -0,0 +1,9 @@
+#include "Helpers.h"
+
+std::string bytespan_to_string(ByteSpan span) {
+    return std::string(span.data(), span.size());
+}
+
+std::vector<char> strtovec(std::string_view str) {
+    return std::vector<char>(str.begin(), str.end());
+}

src/Logger.cpp

@@ -6,11 +6,11 @@
 /// Created by Anonymous275 on 7/17/2020
 ///
 
-#include "Startup.h"
 #include "Logger.h"
+#include "Startup.h"
+#include <chrono>
 #include <fstream>
 #include <sstream>
-#include <chrono>
 #include <thread>
 
 std::string getDate() {
@@ -24,24 +24,25 @@ std::string getDate() {
     std::string Min = (M > 9 ? std::to_string(M) : "0" + std::to_string(M));
     std::string Hour = (H > 9 ? std::to_string(H) : "0" + std::to_string(H));
     date
-            << "["
+        << "["
-            << local_tm.tm_mday << "/"
+        << local_tm.tm_mday << "/"
-            << local_tm.tm_mon + 1 << "/"
+        << local_tm.tm_mon + 1 << "/"
-            << local_tm.tm_year + 1900 << " "
+        << local_tm.tm_year + 1900 << " "
-            << Hour << ":"
+        << Hour << ":"
-            << Min << ":"
+        << Min << ":"
-            << Secs
+        << Secs
-            << "] ";
+        << "] ";
     return date.str();
 }
-void InitLog(){
+void InitLog() {
     std::ofstream LFS;
     LFS.open(GetEP() + "Launcher.log");
-    if(!LFS.is_open()){
+    if (!LFS.is_open()) {
         error("logger file init failed!");
-    }else LFS.close();
+    } else
+        LFS.close();
 }
-void addToLog(const std::string& Line){
+void addToLog(const std::string& Line) {
     std::ofstream LFS;
     LFS.open(GetEP() + "Launcher.log", std::ios_base::app);
     LFS << Line.c_str();
@@ -49,34 +50,35 @@ void addToLog(const std::string& Line){
 }
 void info(const std::string& toPrint) {
     std::string Print = getDate() + "[INFO] " + toPrint + "\n";
-    std::cout << Print;
+    std::cout << Print << std::flush;
     addToLog(Print);
 }
 void debug(const std::string& toPrint) {
-    if(!Dev)return;
+    if (!Dev)
+        return;
     std::string Print = getDate() + "[DEBUG] " + toPrint + "\n";
-    std::cout << Print;
+    std::cout << Print << std::flush;
     addToLog(Print);
 }
-void warn(const std::string& toPrint){
+void warn(const std::string& toPrint) {
     std::string Print = getDate() + "[WARN] " + toPrint + "\n";
-    std::cout << Print;
+    std::cout << Print << std::flush;
     addToLog(Print);
 }
 void error(const std::string& toPrint) {
     std::string Print = getDate() + "[ERROR] " + toPrint + "\n";
-    std::cout << Print;
+    std::cout << Print << std::flush;
     addToLog(Print);
 }
 void fatal(const std::string& toPrint) {
     std::string Print = getDate() + "[FATAL] " + toPrint + "\n";
-    std::cout << Print;
+    std::cout << Print << std::flush;
     addToLog(Print);
     std::this_thread::sleep_for(std::chrono::seconds(5));
     _Exit(-1);
 }
 void except(const std::string& toPrint) {
     std::string Print = getDate() + "[EXCEP] " + toPrint + "\n";
-    std::cout << Print;
+    std::cout << Print << std::flush;
     addToLog(Print);
 }

src/Network/Core.cpp

@@ -5,27 +5,31 @@
 ///
 /// Created by Anonymous275 on 7/20/2020
 ///
-#include "Network/network.hpp"
-#include "Security/Init.h"
-
 #include "Http.h"
-#if defined(_WIN32)
+#include "Network/network.hpp"
-#include <winsock2.h>
+#include "NetworkHelpers.h"
-#include <ws2tcpip.h>
+#include "Security/Init.h"
-
+#include <asio/io_context.hpp>
-#elif defined(__linux__)
+#include <cstdlib>
-#include <sys/types.h>
+#include <optional>
-#include <sys/socket.h>
+#include <regex>
-#include <netdb.h>
+#if defined(__linux__)
 #include <cstring>
 #include <errno.h>
+#include <netdb.h>
+#include <spawn.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
 #endif
 
-#include "Startup.h"
 #include "Logger.h"
+#include "Startup.h"
 #include <charconv>
-#include <thread>
+#include <fmt/format.h>
+#include <nlohmann/json.hpp>
 #include <set>
+#include <thread>
 
 extern int TraceBack;
 std::set<std::string>* ConfList = nullptr;
@@ -33,152 +37,243 @@ bool TCPTerminate = false;
 int DEFAULT_PORT = 4444;
 bool Terminate = false;
 bool LoginAuth = false;
+std::string Username = "";
+std::string UserRole = "";
 std::string UlStatus;
 std::string MStatus;
 bool ModLoaded;
 int ping = -1;
 
-void StartSync(const std::string &Data){
+asio::io_context io {};
-    std::string IP = GetAddr(Data.substr(1,Data.find(':')-1));
+
-    if(IP.find('.') == -1){
+static asio::ip::tcp::socket ResolveAndConnect(const std::string& host_port_string) {
-        if(IP == "DNS")UlStatus ="UlConnection Failed! (DNS Lookup Failed)";
+
-        else UlStatus = "UlConnection Failed! (WSA failed to start)";
+    using namespace asio;
-        ListOfMods = "-";
+    ip::tcp::resolver resolver(io);
-        Terminate = true;
+    asio::error_code ec;
-        return;
+    auto port = host_port_string.substr(host_port_string.find_last_of(':') + 1);
+    auto host = host_port_string.substr(0, host_port_string.find_last_of(':'));
+    auto resolved = resolver.resolve(host, port, ec);
+    if (ec) {
+        ::error(fmt::format("Failed to resolve '[{}]:{}': {}", host, port, ec.message()));
+        throw std::runtime_error(fmt::format("Failed to resolve '{}': {}", host_port_string, ec.message()));
     }
-    CheckLocalKey();
+    bool connected = false;
+
     UlStatus = "UlLoading...";
-    TCPTerminate = false;
+    
-    Terminate = false;
+    for (const auto& addr : resolved) {
-    ConfList->clear();
+        try {
-    ping = -1;
+            info(fmt::format("Resolved and connected to '[{}]:{}'",
-    std::thread GS(TCPGameServer,IP,std::stoi(Data.substr(Data.find(':')+1)));
+                addr.endpoint().address().to_string(),
-    GS.detach();
+                addr.endpoint().port()));
-    info("Connecting to server");
+            ip::tcp::socket socket(io);
+            socket.connect(addr);
+            // done, connected fine
+            return socket;
+        } catch (...) {
+            // ignore
+        }
+    }
+    throw std::runtime_error(fmt::format("Failed to connect to '{}'; connection refused", host_port_string));
 }
-void Parse(std::string Data,SOCKET CSocket){
+
-    char Code = Data.at(0), SubCode = 0;
+void StartSync(const std::string& Data) {
-    if(Data.length() > 1)SubCode = Data.at(1);
+    try {
-    switch (Code){
+        auto Socket = ResolveAndConnect(Data.substr(1));
-        case 'A':
+        ListOfMods = "-";
-            Data = Data.substr(0,1);
+        CheckLocalKey();
-            break;
+        TCPTerminate = false;
-        case 'B':
+        Terminate = false;
+        ConfList->clear();
+        ping = -1;
+        std::thread GS(TCPGameServer, std::move(Socket));
+        GS.detach();
+        info("Connecting to server");
+    } catch (const std::exception& e) {
+        UlStatus = "UlConnection Failed!";
+        error(fmt::format("Client: connect failed! Error: {}", e.what()));
+        WSACleanup();
+        Terminate = true;
+    }
+}
+
+bool IsAllowedLink(const std::string& Link) {
+    std::vector<std::string> allowed_links = {
+        R"(patreon\.com\/beammp$)",
+        R"(discord\.gg\/beammp$)",
+        R"(forum\.beammp\.com$)",
+        R"(beammp\.com$)",
+        R"(patreon\.com\/beammp\/$)",
+        R"(discord\.gg\/beammp\/$)",
+        R"(forum\.beammp\.com\/$)",
+        R"(beammp\.com\/$)",
+        R"(docs\.beammp\.com$)",
+        R"(wiki\.beammp\.com$)",
+        R"(docs\.beammp\.com\/$)",
+        R"(wiki\.beammp\.com\/$)",
+        R"(docs\.beammp\.com\/.*$)",
+        R"(wiki\.beammp\.com\/.*$)",
+    };
+    for (const auto& allowed_link : allowed_links) {
+        if (std::regex_match(Link, std::regex(std::string(R"(^http(s)?:\/\/)") + allowed_link))) {
+            return true;
+        }
+    }
+    return false;
+}
+
+void Parse(std::span<char> InData, asio::ip::tcp::socket& CSocket) {
+    std::string OutData;
+    char Code = InData[0], SubCode = 0;
+    if (InData.size() > 1)
+        SubCode = InData[1];
+    switch (Code) {
+    case 'A':
+        OutData = "A";
+        break;
+    case 'B':
+        NetReset();
+        Terminate = true;
+        TCPTerminate = true;
+        OutData = Code + HTTP::Get("https://backend.beammp.com/servers-info");
+        break;
+    case 'C':
+        ListOfMods.clear();
+        StartSync(std::string(InData.data(), InData.size()));
+        while (ListOfMods.empty() && !Terminate) {
+            std::this_thread::sleep_for(std::chrono::seconds(1));
+        }
+        if (ListOfMods == "-")
+            OutData = "L";
+        else
+            OutData = "L" + ListOfMods;
+        break;
+    case 'O': // open default browser with URL
+        if (IsAllowedLink(bytespan_to_string(InData.subspan(1)))) {
+#if defined(__linux)
+            if (char* browser = getenv("BROWSER"); browser != nullptr && !std::string_view(browser).empty()) {
+                pid_t pid;
+                auto arg = bytespan_to_string(InData.subspan(1));
+                char* argv[] = { browser, arg.data() };
+                auto status = posix_spawn(&pid, browser, nullptr, nullptr, argv, environ);
+                if (status == 0) {
+                    debug("Browser PID: " + std::to_string(pid));
+                    // we don't wait for it to exit, because we just don't care.
+                    // typically, you'd waitpid() here.
+                } else {
+                    error("Failed to open the following link in the browser (error follows below): " + arg);
+                    error(std::string("posix_spawn: ") + strerror(status));
+                }
+            } else {
+                error("Failed to open the following link in the browser because the $BROWSER environment variable is not set: " + bytespan_to_string(InData.subspan(1)));
+            }
+#elif defined(WIN32)
+            ShellExecuteA(nullptr, "open", InData.subspan(1).data(), nullptr, nullptr, SW_SHOW); /// TODO: Look at when working on linux port
+#endif
+
+            info("Opening Link \"" + bytespan_to_string(InData.subspan(1)) + "\"");
+        }
+        OutData.clear();
+        break;
+    case 'P':
+        OutData = Code + std::to_string(ProxyPort);
+        break;
+    case 'U':
+        if (SubCode == 'l')
+            OutData = UlStatus;
+        if (SubCode == 'p') {
+            if (ping > 800) {
+                OutData = "Up-2";
+            } else
+                OutData = "Up" + std::to_string(ping);
+        }
+        if (!SubCode) {
+            std::string Ping;
+            if (ping > 800)
+                Ping = "-2";
+            else
+                Ping = std::to_string(ping);
+            OutData = std::string(UlStatus) + "\n" + "Up" + Ping;
+        }
+        break;
+    case 'M':
+        OutData = MStatus;
+        break;
+    case 'Q':
+        if (SubCode == 'S') {
             NetReset();
             Terminate = true;
             TCPTerminate = true;
-            Data = Code + HTTP::Get("https://backend.beammp.com/servers-info");
+            ping = -1;
-            break;
+        }
-        case 'C':
+        if (SubCode == 'G')
-            ListOfMods.clear();
+            exit(2);
-            StartSync(Data);
+        OutData.clear();
-            while(ListOfMods.empty() && !Terminate){
+        break;
-                std::this_thread::sleep_for(std::chrono::seconds(1));
+    case 'R': // will send mod name
+    {
+        auto str = bytespan_to_string(InData);
+        if (ConfList->find(str) == ConfList->end()) {
+            ConfList->insert(str);
+            ModLoaded = true;
+        }
+        OutData.clear();
+    } break;
+    case 'Z':
+        OutData = "Z" + GetVer();
+        break;
+    case 'N':
+        if (SubCode == 'c') {
+            nlohmann::json Auth = {
+                { "Auth", LoginAuth ? 1 : 0 },
+            };
+            if (!Username.empty()) {
+                Auth["username"] = Username;
             }
-            if(ListOfMods == "-")Data = "L";
+            if (!UserRole.empty()) {
-            else Data = "L"+ListOfMods;
+                Auth["role"] = UserRole;
-            break;
-        case 'U':
-            if(SubCode == 'l')Data = UlStatus;
-            if(SubCode == 'p'){
-                if(ping > 800){
-                    Data = "Up-2";
-                }else Data = "Up" + std::to_string(ping);
             }
-            if(!SubCode){
+            OutData = "N" + Auth.dump();
-                std::string Ping;
+        } else {
-                if(ping > 800)Ping = "-2";
+            auto indata_str = bytespan_to_string(InData);
-                else Ping = std::to_string(ping);
+            OutData = "N" + Login(indata_str.substr(indata_str.find(':') + 1));
-                Data = std::string(UlStatus) + "\n" + "Up" + Ping;
+        }
-            }
+        break;
-            break;
+    default:
-        case 'M':
+        OutData.clear();
-            Data = MStatus;
+        break;
-            break;
-        case 'Q':
-            if(SubCode == 'S'){
-                NetReset();
-                Terminate = true;
-                TCPTerminate = true;
-                ping = -1;
-            }
-            if(SubCode == 'G')exit(2);
-            Data.clear();
-            break;
-        case 'R': //will send mod name
-            if(ConfList->find(Data) == ConfList->end()){
-                ConfList->insert(Data);
-                ModLoaded = true;
-            }
-            Data.clear();
-            break;
-        case 'Z':
-            Data = "Z" + GetVer();
-            break;
-        case 'N':
-            if (SubCode == 'c'){
-                Data = "N{\"Auth\":"+std::to_string(LoginAuth)+"}";
-            }else{
-                Data = "N" + Login(Data.substr(Data.find(':') + 1));
-            }
-            break;
-        default:
-            Data.clear();
-            break;
     }
-    if(!Data.empty() && CSocket != -1){
+    if (!OutData.empty() && CSocket.is_open()) {
-        int res = send(CSocket, (Data+"\n").c_str(), int(Data.size())+1, 0);
+        uint32_t DataSize = OutData.size();
-        if(res < 0){
+        std::vector<char> ToSend(sizeof(DataSize) + OutData.size());
-            debug("(Core) send failed with error: " + std::to_string(WSAGetLastError()));
+        std::copy_n(reinterpret_cast<char*>(&DataSize), sizeof(DataSize), ToSend.begin());
+        std::copy_n(OutData.data(), OutData.size(), ToSend.begin() + sizeof(DataSize));
+        asio::error_code ec;
+        asio::write(CSocket, asio::buffer(ToSend), ec);
+        if (ec) {
+            debug(fmt::format("(Core) send failed with error: {}", ec.message()));
         }
     }
 }
-void GameHandler(SOCKET Client){
+void GameHandler(asio::ip::tcp::socket& Client) {
-
+    std::vector<char> data {};
-    int32_t Size,Temp,Rcv;
+    do {
-    char Header[10] = {0};
+        try {
-    do{
+            ReceiveFromGame(Client, data);
-        Rcv = 0;
+            Parse(data, Client);
-        do{
+        } catch (const std::exception& e) {
-            Temp = recv(Client,&Header[Rcv],1,0);
+            error(std::string("Error while receiving from game: ") + e.what());
-            if(Temp < 1)break;
-            if(!isdigit(Header[Rcv]) && Header[Rcv] != '>') {
-                error("(Core) Invalid lua communication");
-                KillSocket(Client);
-                return;
-            }
-        }while(Header[Rcv++] != '>');
-        if(Temp < 1)break;
-        if(std::from_chars(Header,&Header[Rcv],Size).ptr[0] != '>'){
-            debug("(Core) Invalid lua Header -> " + std::string(Header,Rcv));
             break;
         }
-        std::string Ret(Size,0);
+    } while (true);
-        Rcv = 0;
-
-        do{
-            Temp = recv(Client,&Ret[Rcv],Size-Rcv,0);
-            if(Temp < 1)break;
-            Rcv += Temp;
-        }while(Rcv < Size);
-        if(Temp < 1)break;
-
-        std::thread Respond(Parse, Ret, Client);
-        Respond.detach();
-    }while(Temp > 0);
-    if (Temp == 0) {
-        debug("(Core) Connection closing");
-    } else {
-        debug("(Core) recv failed with error: " + std::to_string(WSAGetLastError()));
-    }
     NetReset();
     KillSocket(Client);
 }
-void localRes(){
+void localRes() {
     MStatus = " ";
     UlStatus = "Ulstart";
-    if(ConfList != nullptr){
+    if (ConfList != nullptr) {
         ConfList->clear();
         delete ConfList;
         ConfList = nullptr;
@@ -187,91 +282,82 @@ void localRes(){
 }
 void CoreMain() {
     debug("Core Network on start!");
-    SOCKET LSocket,CSocket;
-    struct addrinfo *res = nullptr;
-    struct addrinfo hints{};
-    int iRes;
-    #ifdef _WIN32
-    WSADATA wsaData;
-    iRes = WSAStartup(514, &wsaData); //2.2
-    if (iRes)debug("WSAStartup failed with error: " + std::to_string(iRes));
-    #endif
-    
-    ZeroMemory(&hints, sizeof(hints));
 
-    hints.ai_family = AF_INET;
+    asio::ip::tcp::endpoint listen_ep(asio::ip::address::from_string("0.0.0.0"), static_cast<uint16_t>(DEFAULT_PORT));
-    hints.ai_socktype = SOCK_STREAM;
+    asio::ip::tcp::socket LSocket(io);
-    hints.ai_protocol = IPPROTO_TCP;
+    asio::error_code ec;
-    hints.ai_flags = AI_PASSIVE;
+    LSocket.open(listen_ep.protocol(), ec);
-    iRes = getaddrinfo(nullptr, std::to_string(DEFAULT_PORT).c_str(), &hints, &res);
+    if (ec) {
-    if (iRes){
+        ::error(fmt::format("Failed to open core socket: {}", ec.message()));
-        debug("(Core) addr info failed with error: " + std::to_string(iRes));
-        WSACleanup();
         return;
     }
-    LSocket = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+    asio::ip::tcp::socket::linger linger_opt {};
-    if (LSocket == -1){
+    linger_opt.enabled(false);
-        debug("(Core) socket failed with error: " + std::to_string(WSAGetLastError()));
+    LSocket.set_option(linger_opt, ec);
-        freeaddrinfo(res);
+    if (ec) {
-        WSACleanup();
+        ::error(fmt::format("Failed to set up listening core socket to not linger / reuse address. "
+                            "This may cause the core socket to refuse to bind(). Error: {}",
+            ec.message()));
         return;
     }
-    iRes = bind(LSocket, res->ai_addr, int(res->ai_addrlen));
+    asio::ip::tcp::socket::reuse_address reuse_opt { true };
-    if (iRes == SOCKET_ERROR) {
+    LSocket.set_option(reuse_opt, ec);
-        error("(Core) bind failed with error: " + std::to_string(WSAGetLastError()));
+    if (ec) {
-        freeaddrinfo(res);
+        ::error(fmt::format("Failed to set up listening core socket to not linger / reuse address. "
-        KillSocket(LSocket);
+                            "This may cause the core socket to refuse to bind(). Error: {}",
-        WSACleanup();
+            ec.message()));
         return;
     }
-    iRes = listen(LSocket, SOMAXCONN);
+
-    if (iRes == SOCKET_ERROR) {
+    auto acceptor = asio::ip::tcp::acceptor(io, listen_ep);
-        debug("(Core) listen failed with error: " + std::to_string(WSAGetLastError()));
+    acceptor.listen(asio::ip::tcp::socket::max_listen_connections, ec);
-        freeaddrinfo(res);
+    if (ec) {
-        KillSocket(LSocket);
+        ::error(fmt::format("listen() failed, which is needed for the launcher to operate. Error: {}",
-        WSACleanup();
+            ec.message()));
         return;
     }
-    do{
+
-        CSocket = accept(LSocket, nullptr, nullptr);
+    do {
-        if (CSocket == -1) {
+        auto CSocket = acceptor.accept(ec);
-            error("(Core) accept failed with error: " + std::to_string(WSAGetLastError()));
+        if (ec) {
+            error(fmt::format("(Core) accept failed with error: {}", ec.message()));
             continue;
         }
         localRes();
         info("Game Connected!");
         GameHandler(CSocket);
         warn("Game Reconnecting...");
-    }while(CSocket);
+    } while (LSocket.is_open());
     KillSocket(LSocket);
     WSACleanup();
 }
 
 #if defined(_WIN32)
-int Handle(EXCEPTION_POINTERS *ep){
+int Handle(EXCEPTION_POINTERS* ep) {
     char* hex = new char[100];
-    sprintf_s(hex,100, "%lX", ep->ExceptionRecord->ExceptionCode);
+    sprintf_s(hex, 100, "%lX", ep->ExceptionRecord->ExceptionCode);
     except("(Core) Code : " + std::string(hex));
-    delete [] hex;
+    delete[] hex;
     return 1;
 }
 #endif
 
-[[noreturn]] void CoreNetwork(){
+[[noreturn]] void CoreNetwork() {
-    while(true) {
+    while (true) {
-        #if not defined(__MINGW32__)
+#if not defined(__MINGW32__)
-            __try{
+        __try {
-        #endif
+#endif
-        
-        CoreMain();
 
-        #if not defined(__MINGW32__) and not defined(__linux__)
+            CoreMain();
-            }__except(Handle(GetExceptionInformation())){}
+
-        #elif not defined(__MINGW32__) and defined(__linux__)
+#if not defined(__MINGW32__) and not defined(__linux__)
-            } catch(...){
+        } __except (Handle(GetExceptionInformation())) { }
-                except("(Core) Code : " + std::string(strerror(errno)));
+#elif not defined(__MINGW32__) and defined(__linux__)
-            }
+    }
-        #endif
+    catch (...) {
+        except("(Core) Code : " + std::string(strerror(errno)));
+    }
+#endif
 
         std::this_thread::sleep_for(std::chrono::seconds(1));
     }

src/Network/DNS.cpp

@@ -12,31 +12,32 @@
 #include <winsock2.h>
 #elif defined(__linux__)
 #include "linuxfixes.h"
-#include <netdb.h>
 #include <arpa/inet.h>
+#include <netdb.h>
 #endif
 
 #include "Logger.h"
 
-std::string GetAddr(const std::string&IP){
+std::string GetAddr(const std::string& IP) {
-    if(IP.find_first_not_of("0123456789.") == -1)return IP;
+    if (IP.find_first_not_of("0123456789.") == -1)
-    hostent *host;
+        return IP;
-    #ifdef _WIN32
+    hostent* host;
+#ifdef _WIN32
     WSADATA wsaData;
-    if(WSAStartup(514, &wsaData) != 0){
+    if (WSAStartup(514, &wsaData) != 0) {
         error("WSA Startup Failed!");
         WSACleanup();
         return "";
     }
-    #endif
+#endif
-    
+
     host = gethostbyname(IP.c_str());
-    if(!host){
+    if (!host) {
         error("DNS lookup failed! on " + IP);
         WSACleanup();
         return "DNS";
     }
-    std::string Ret = inet_ntoa(*((struct in_addr *)host->h_addr));
+    std::string Ret = inet_ntoa(*((struct in_addr*)host->h_addr));
     WSACleanup();
     return Ret;
 }

src/Network/GlobalHandler.cpp

@@ -5,274 +5,254 @@
 ///
 /// Created by Anonymous275 on 7/25/2020
 ///
+#include "Helpers.h"
 #include "Network/network.hpp"
+#include "NetworkHelpers.h"
+#include "asio/socket_base.hpp"
+#include <algorithm>
+#include <span>
+#include <vector>
+#include <zlib.h>
 #if defined(_WIN32)
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #elif defined(__linux__)
 #include "linuxfixes.h"
+#include <arpa/inet.h>
+#include <cstring>
+#include <netdb.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <netdb.h>
-#include <arpa/inet.h>
-#include <cstring>
 #endif
 
 #include "Logger.h"
 #include <charconv>
+#include <fmt/format.h>
+#include <mutex>
 #include <string>
 #include <thread>
-#include <mutex>
 
-std::chrono::time_point<std::chrono::high_resolution_clock> PingStart,PingEnd;
+std::chrono::time_point<std::chrono::high_resolution_clock> PingStart, PingEnd;
 bool GConnected = false;
 bool CServer = true;
-SOCKET CSocket = -1;
+std::shared_ptr<asio::ip::tcp::socket> CSocket = nullptr;
-SOCKET GSocket = -1;
+std::shared_ptr<asio::ip::tcp::socket> GSocket = nullptr;
 
-int KillSocket(uint64_t Dead){
+void KillSocket(std::shared_ptr<asio::ip::tcp::socket>& Dead) {
-    if(Dead == (SOCKET)-1){
+    if (!Dead)
-        debug("Kill socket got -1 returning...");
+        return;
-        return 0;
+    asio::error_code ec;
-    }
+    Dead->shutdown(asio::socket_base::shutdown_both, ec);
-    shutdown(Dead,SD_BOTH);
-    int a = closesocket(Dead);
-    if(a != 0){
-        warn("Failed to close socket!");
-    }
-    return a;
 }
 
-bool CheckBytes(uint32_t Bytes){
+void KillSocket(std::shared_ptr<asio::ip::udp::socket>& Dead) {
-    if(Bytes == 0){
+    if (!Dead)
+        return;
+    asio::error_code ec;
+    Dead->shutdown(asio::socket_base::shutdown_both, ec);
+}
+
+void KillSocket(asio::ip::tcp::socket& Dead) {
+    asio::error_code ec;
+    Dead.shutdown(asio::socket_base::shutdown_both, ec);
+}
+
+void KillSocket(asio::ip::udp::socket& Dead) {
+    asio::error_code ec;
+    Dead.shutdown(asio::socket_base::shutdown_both, ec);
+}
+
+bool CheckBytes(uint32_t Bytes) {
+    if (Bytes == 0) {
         debug("(Proxy) Connection closing");
         return false;
-    }else if(Bytes < 0){
+    } else if (Bytes < 0) {
         debug("(Proxy) send failed with error: " + std::to_string(WSAGetLastError()));
         return false;
     }
     return true;
 }
 
-void GameSend(std::string Data){
+void GameSend(std::string_view RawData) {
     static std::mutex Lock;
     std::scoped_lock Guard(Lock);
-    if(TCPTerminate || !GConnected || CSocket == -1)return;
+    if (TCPTerminate || !GConnected || CSocket == nullptr)
-    int32_t Size,Temp,Sent;
+        return;
-    Data += '\n';
+    int32_t Size, Temp, Sent;
-    Size = int32_t(Data.size());
+    uint32_t DataSize = RawData.size();
+    std::vector<char> Data(sizeof(DataSize) + RawData.size());
+    std::copy_n(reinterpret_cast<char*>(&DataSize), sizeof(DataSize), Data.begin());
+    std::copy_n(RawData.data(), RawData.size(), Data.begin() + sizeof(DataSize));
+    Size = Data.size();
     Sent = 0;
-    #ifdef DEBUG
+
-        if(Size > 1000){
+    asio::error_code ec;
-            debug("Launcher -> game (" +std::to_string(Size)+")");
+    asio::write(*CSocket, asio::buffer(Data), ec);
-        }
+    if (ec) {
-    #endif
+        debug(fmt::format("(TCP CB) recv failed with error: {}", ec.message()));
-    do{
+        KillSocket(TCPSock);
-         if(Sent > -1){
+        Terminate = true;
-            Temp = send(CSocket, &Data[Sent], Size - Sent, 0);
-         }
-        if(!CheckBytes(Temp))return;
-        Sent += Temp;
-    }while(Sent < Size);
-}
-void ServerSend(std::string Data, bool Rel){
-    if(Terminate || Data.empty())return;
-    if(Data.find("Zp") != std::string::npos && Data.size() > 500){
-        abort();
     }
+}
+
+void ServerSend(const std::vector<char>& Data, bool Rel) {
+    if (Terminate || Data.empty())
+        return;
     char C = 0;
     bool Ack = false;
-    int DLen = int(Data.length());
+    int DLen = int(Data.size());
-    if(DLen > 3)C = Data.at(0);
+    if (DLen > 3)
-    if (C == 'O' || C == 'T')Ack = true;
+        C = Data.at(0);
-    if(C == 'N' || C == 'W' || C == 'Y' || C == 'V' || C == 'E' || C == 'C')Rel = true;
+    if (C == 'O' || C == 'T')
-    if(Ack || Rel){
+        Ack = true;
-        if(Ack || DLen > 1000)SendLarge(Data);
+    if (C == 'N' || C == 'W' || C == 'Y' || C == 'V' || C == 'E' || C == 'C')
-        else TCPSend(Data,TCPSock);
+        Rel = true;
-    }else UDPSend(Data);
+    if (compressBound(Data.size()) > 1024)
-
+        Rel = true;
-    if (DLen > 1000) {
+    if (Ack || Rel) {
-        debug("(Launcher->Server) Bytes sent: " + std::to_string(Data.length()) + " : "
+        if (Ack || DLen > 1000)
-                     + Data.substr(0, 10)
+            SendLarge(Data);
-                     + Data.substr(Data.length() - 10));
+        else if (TCPSock)
-    }else if(C == 'Z'){
+            TCPSend(Data, *TCPSock);
-        //debug("(Game->Launcher) : " + Data);
+    } else
-    }
+        UDPSend(Data);
 }
 
-void NetReset(){
+void NetReset() {
     TCPTerminate = false;
     GConnected = false;
     Terminate = false;
     UlStatus = "Ulstart";
     MStatus = " ";
-    if(UDPSock != (SOCKET)(-1)){
+    if (UDPSock != nullptr) {
-        debug("Terminating UDP Socket : " + std::to_string(TCPSock));
+        KillSocket(*UDPSock);
-        KillSocket(UDPSock);
     }
-    UDPSock = -1;
+    UDPSock = nullptr;
-    if(TCPSock != (SOCKET)(-1)){
+    if (TCPSock != nullptr) {
-        debug("Terminating TCP Socket : " + std::to_string(TCPSock));
+        KillSocket(*TCPSock);
-        KillSocket(TCPSock);
     }
-    TCPSock = -1;
+    TCPSock = nullptr;
-    if(GSocket != (SOCKET)(-1)){
+    if (GSocket != nullptr) {
-        debug("Terminating GTCP Socket : " + std::to_string(GSocket));
+        KillSocket(*GSocket);
-        KillSocket(GSocket);
     }
-    GSocket = -1;
+    GSocket = nullptr;
 }
 
-SOCKET SetupListener(){
+void AutoPing() {
-    if(GSocket != -1)return GSocket;
+    while (!Terminate) {
-    struct addrinfo *result = nullptr;
+        ServerSend(strtovec("p"), false);
-    struct addrinfo hints{};
-    int iRes;
-    #ifdef _WIN32
-    WSADATA wsaData;
-    iRes = WSAStartup(514, &wsaData); //2.2
-    if (iRes != 0) {
-        error("(Proxy) WSAStartup failed with error: " + std::to_string(iRes));
-        return -1;
-    }
-    #endif
-
-    ZeroMemory(&hints, sizeof(hints));
-    hints.ai_family = AF_INET;
-    hints.ai_socktype = SOCK_STREAM;
-    hints.ai_protocol = IPPROTO_TCP;
-    hints.ai_flags = AI_PASSIVE;
-    iRes = getaddrinfo(nullptr, std::to_string(DEFAULT_PORT+1).c_str(), &hints, &result);
-    if (iRes != 0) {
-        error("(Proxy) info failed with error: " + std::to_string(iRes));
-        WSACleanup();
-    }
-    GSocket = socket(result->ai_family, result->ai_socktype, result->ai_protocol);
-    if (GSocket == -1) {
-        error("(Proxy) socket failed with error: " + std::to_string(WSAGetLastError()));
-        freeaddrinfo(result);
-        WSACleanup();
-        return -1;
-    }
-    iRes = bind(GSocket, result->ai_addr, (int) result->ai_addrlen);
-    if (iRes == SOCKET_ERROR) {
-        error("(Proxy) bind failed with error: " + std::to_string(WSAGetLastError()));
-        freeaddrinfo(result);
-        KillSocket(GSocket);
-        WSACleanup();
-        return -1;
-    }
-    freeaddrinfo(result);
-    iRes = listen(GSocket, SOMAXCONN);
-    if (iRes == SOCKET_ERROR) {
-        error("(Proxy) listen failed with error: " + std::to_string(WSAGetLastError()));
-        KillSocket(GSocket);
-        WSACleanup();
-        return -1;
-    }
-    return GSocket;
-}
-void AutoPing(){
-    while(!Terminate){
-        ServerSend("p",false);
         PingStart = std::chrono::high_resolution_clock::now();
-        std::this_thread::sleep_for(std::chrono::seconds (1));
+        std::this_thread::sleep_for(std::chrono::seconds(1));
     }
 }
 int ClientID = -1;
-void ParserAsync(const std::string& Data){
+void ParserAsync(std::string_view Data) {
-    if(Data.empty())return;
+    if (Data.empty())
-    char Code = Data.at(0),SubCode = 0;
+        return;
-    if(Data.length() > 1)SubCode = Data.at(1);
+    char Code = Data.at(0), SubCode = 0;
+    if (Data.length() > 1)
+        SubCode = Data.at(1);
     switch (Code) {
-        case 'p':
+    case 'p':
-            PingEnd = std::chrono::high_resolution_clock::now();
+        PingEnd = std::chrono::high_resolution_clock::now();
-            if(PingStart > PingEnd)ping = 0;
+        if (PingStart > PingEnd)
-            else ping = int(std::chrono::duration_cast<std::chrono::milliseconds>(PingEnd-PingStart).count());
+            ping = 0;
-            return;
+        else
-        case 'M':
+            ping = int(std::chrono::duration_cast<std::chrono::milliseconds>(PingEnd - PingStart).count());
-            MStatus = Data;
+        return;
-            UlStatus = "Uldone";
+    case 'M':
-            return;
+        MStatus = Data;
-        default:
+        UlStatus = "Uldone";
-            break;
+        return;
+    default:
+        break;
     }
     GameSend(Data);
 }
-void ServerParser(const std::string& Data){
+void ServerParser(std::string_view Data) {
     ParserAsync(Data);
 }
-void NetMain(const std::string& IP, int Port){
+void NetMain(asio::ip::address addr, uint16_t port) {
     std::thread Ping(AutoPing);
     Ping.detach();
-    UDPClientMain(IP,Port);
+    UDPClientMain(addr, port);
     CServer = true;
     Terminate = true;
     info("Connection Terminated!");
 }
-void TCPGameServer(const std::string& IP, int Port){
+void TCPGameServer(asio::ip::tcp::socket&& Socket) {
-    GSocket = SetupListener();
+    asio::ip::tcp::endpoint listen_ep(asio::ip::address::from_string("0.0.0.0"), static_cast<uint16_t>(DEFAULT_PORT + 1));
-    while (!TCPTerminate && GSocket != -1){
+    asio::ip::tcp::socket listener(io);
+    asio::error_code ec;
+    listener.open(listen_ep.protocol(), ec);
+    if (ec) {
+        ::error(fmt::format("Failed to open game socket: {}", ec.message()));
+        return;
+    }
+    asio::ip::tcp::socket::linger linger_opt {};
+    linger_opt.enabled(false);
+    listener.set_option(linger_opt, ec);
+    if (ec) {
+        ::error(fmt::format("Failed to set up listening game socket to not linger / reuse address. "
+                            "This may cause the game socket to refuse to bind(). Error: {}",
+            ec.message()));
+    }
+    asio::ip::tcp::socket::reuse_address reuse_opt { true };
+    listener.set_option(reuse_opt, ec);
+    if (ec) {
+        ::error(fmt::format("Failed to set up listening core socket to not linger / reuse address. "
+                            "This may cause the core socket to refuse to bind(). Error: {}",
+            ec.message()));
+        return;
+    }
+    auto acceptor = asio::ip::tcp::acceptor(io, listen_ep);
+    acceptor.listen(asio::ip::tcp::socket::max_listen_connections, ec);
+    if (ec) {
+        debug(fmt::format("Proxy accept failed: {}", ec.message()));
+        TCPTerminate = true; // skip the loop
+    }
+    debug(fmt::format("Game server listening on {}:{}", acceptor.local_endpoint().address().to_string(), acceptor.local_endpoint().port()));
+    while (!TCPTerminate && acceptor.is_open()) {
         debug("MAIN LOOP OF GAME SERVER");
         GConnected = false;
-        if(!CServer){
+        if (!CServer) {
             warn("Connection still alive terminating");
             NetReset();
             TCPTerminate = true;
             Terminate = true;
             break;
         }
-        if(CServer) {
+        if (CServer) {
-            std::thread Client(TCPClientMain, IP, Port);
+            std::thread Client(TCPClientMain, std::move(Socket));
             Client.detach();
         }
-        CSocket = accept(GSocket, nullptr, nullptr);
+
-        if (CSocket == -1) {
+        CSocket = std::make_shared<asio::ip::tcp::socket>(acceptor.accept());
-            debug("(Proxy) accept failed with error: " + std::to_string(WSAGetLastError()));
-            break;
-        }
         debug("(Proxy) Game Connected!");
         GConnected = true;
-        if(CServer){
+        if (CServer) {
-            std::thread t1(NetMain, IP, Port);
+            std::thread t1(NetMain, CSocket->remote_endpoint().address(), CSocket->remote_endpoint().port());
             t1.detach();
             CServer = false;
         }
-        int32_t Size,Temp,Rcv;
+        std::vector<char> data {};
-        char Header[10] = {0};
 
-        //Read byte by byte until '>' is rcved then get the size and read based on it
+        // Read byte by byte until '>' is rcved then get the size and read based on it
-        do{
+        while (!TCPTerminate && !CSocket) {
-            Rcv = 0;
+            try {
-
+                ReceiveFromGame(*CSocket, data);
-            do{
+                ServerSend(data, false);
-                Temp = recv(CSocket,&Header[Rcv],1,0);
+            } catch (const std::exception& e) {
-                if(Temp < 1 || TCPTerminate)break;
+                error(std::string("Error while receiving from game: ") + e.what());
-            }while(Header[Rcv++] != '>');
-            if(Temp < 1 || TCPTerminate)break;
-            if(std::from_chars(Header,&Header[Rcv],Size).ptr[0] != '>'){
-                debug("(Game) Invalid lua Header -> " + std::string(Header,Rcv));
                 break;
             }
-            std::string Ret(Size,0);
+        }
-            Rcv = 0;
-            do{
-                Temp = recv(CSocket,&Ret[Rcv],Size-Rcv,0);
-                if(Temp < 1)break;
-                Rcv += Temp;
-            }while(Rcv < Size && !TCPTerminate);
-            if(Temp < 1 || TCPTerminate)break;
-
-            ServerSend(Ret,false);
-
-        }while(Temp > 0 && !TCPTerminate);
-        if(Temp == 0)debug("(Proxy) Connection closing");
-        else debug("(Proxy) recv failed error : " + std::to_string(WSAGetLastError()));
     }
     TCPTerminate = true;
     GConnected = false;
     Terminate = true;
-    if(CSocket != SOCKET_ERROR)KillSocket(CSocket);
+    if (CSocket != nullptr)
+        KillSocket(CSocket);
     debug("END OF GAME SERVER");
-}
+}

src/Network/Http.cpp

@@ -7,27 +7,62 @@
 ///
 #define CPPHTTPLIB_OPENSSL_SUPPORT
 
-#include <iostream>
-#include <Logger.h>
-#include <fstream>
 #include "Http.h"
-#include <mutex>
+#include <Logger.h>
 #include <cmath>
+#include <filesystem>
+#include <fstream>
 #include <httplib.h>
+#include <iostream>
+#include <mutex>
+#include <nlohmann/json.hpp>
+
+void WriteHttpDebug(const httplib::Client& client, const std::string& method, const std::string& target, const httplib::Result& result) try {
+    const std::filesystem::path folder = ".https_debug";
+    std::filesystem::create_directories(folder);
+    if (!std::filesystem::exists(folder / "WHAT IS THIS FOLDER.txt")) {
+        std::ofstream ignore { folder / "WHAT IS THIS FOLDER.txt" };
+        ignore << "This folder exists to help debug current issues with the backend. Do not share this folder with anyone but BeamMP staff. It contains detailed logs of any failed http requests." << std::endl;
+    }
+    const auto file = folder / (method + ".json");
+    // 1 MB limit
+    if (std::filesystem::exists(file) && std::filesystem::file_size(file) > 1'000'000) {
+        std::filesystem::rename(file, file.generic_string() + ".bak");
+    }
+
+    std::ofstream of { file, std::ios::app };
+    nlohmann::json js {
+        { "utc", std::chrono::system_clock::now().time_since_epoch().count() },
+        { "target", target },
+        { "client_info", {
+                             { "openssl_verify_result", client.get_openssl_verify_result() },
+                             { "host", client.host() },
+                             { "port", client.port() },
+                             { "socket_open", client.is_socket_open() },
+                             { "valid", client.is_valid() },
+                         } },
+    };
+    if (result) {
+        auto value = result.value();
+        js["result"] = {};
+        js["result"]["body"] = value.body;
+        js["result"]["status"] = value.status;
+        js["result"]["headers"] = value.headers;
+        js["result"]["version"] = value.version;
+        js["result"]["location"] = value.location;
+        js["result"]["reason"] = value.reason;
+    }
+    of << js.dump();
+} catch (const std::exception& e) {
+    error(e.what());
+}
 
-std::string HTTP::Codes_[] =
-{
- "Success","Unknown","Connection","BindIPAddress",
- "Read","Write","ExceedRedirectCount","Canceled",
- "SSLConnection","SSLLoadingCerts","SSLServerVerification",
- "UnsupportedMultipartBoundaryChars","Compression"
-};
 bool HTTP::isDownload = false;
-std::string HTTP::Get(const std::string &IP) {
+std::string HTTP::Get(const std::string& IP) {
     static std::mutex Lock;
     std::scoped_lock Guard(Lock);
 
-    auto pos = IP.find('/',10);
+    auto pos = IP.find('/', 10);
 
     httplib::Client cli(IP.substr(0, pos).c_str());
     cli.set_connection_timeout(std::chrono::seconds(10));
@@ -35,16 +70,19 @@ std::string HTTP::Get(const std::string &IP) {
     auto res = cli.Get(IP.substr(pos).c_str(), ProgressBar);
     std::string Ret;
 
-    if(res.error() == 0){
+    if (res) {
-        if(res->status == 200){
+        if (res->status == 200) {
             Ret = res->body;
-        }else error(res->reason);
+        } else {
-
+            WriteHttpDebug(cli, "GET", IP, res);
-    }else{
+            error("Failed to GET '" + IP + "': " + res->reason + ", ssl verify = " + std::to_string(cli.get_openssl_verify_result()));
-        if(isDownload) {
+        }
+    } else {
+        if (isDownload) {
             std::cout << "\n";
         }
-        error("HTTP Get failed on " + Codes_[res.error()]);
+        WriteHttpDebug(cli, "GET", IP, res);
+        error("HTTP Get failed on " + to_string(res.error()) + ", ssl verify = " + std::to_string(cli.get_openssl_verify_result()));
     }
 
     return Ret;
@@ -54,41 +92,45 @@ std::string HTTP::Post(const std::string& IP, const std::string& Fields) {
     static std::mutex Lock;
     std::scoped_lock Guard(Lock);
 
-    auto pos = IP.find('/',10);
+    auto pos = IP.find('/', 10);
 
     httplib::Client cli(IP.substr(0, pos).c_str());
     cli.set_connection_timeout(std::chrono::seconds(10));
     std::string Ret;
 
-    if(!Fields.empty()) {
+    if (!Fields.empty()) {
         httplib::Result res = cli.Post(IP.substr(pos).c_str(), Fields, "application/json");
 
-        if(res.error() == 0) {
+        if (res) {
             if (res->status != 200) {
                 error(res->reason);
             }
             Ret = res->body;
-        }else{
+        } else {
-            error("HTTP Post failed on " + Codes_[res.error()]);
+            WriteHttpDebug(cli, "POST", IP, res);
+            error("HTTP Post failed on " + to_string(res.error()) + ", ssl verify = " + std::to_string(cli.get_openssl_verify_result()));
         }
-    }else{
+    } else {
         httplib::Result res = cli.Post(IP.substr(pos).c_str());
-        if(res.error() == 0) {
+        if (res) {
             if (res->status != 200) {
                 error(res->reason);
             }
             Ret = res->body;
-        }else{
+        } else {
-            error("HTTP Post failed on " + Codes_[res.error()]);
+            WriteHttpDebug(cli, "POST", IP, res);
+            error("HTTP Post failed on " + to_string(res.error()) + ", ssl verify = " + std::to_string(cli.get_openssl_verify_result()));
         }
     }
 
-    if(Ret.empty())return "-1";
+    if (Ret.empty())
-    else return Ret;
+        return "-1";
+    else
+        return Ret;
 }
 
-bool HTTP::ProgressBar(size_t c, size_t t){
+bool HTTP::ProgressBar(size_t c, size_t t) {
-    if(isDownload) {
+    if (isDownload) {
         static double last_progress, progress_bar_adv;
         progress_bar_adv = round(c / double(t) * 25);
         std::cout << "\r";
@@ -96,15 +138,17 @@ bool HTTP::ProgressBar(size_t c, size_t t){
         std::cout << round(c / double(t) * 100);
         std::cout << "% ] [";
         int i;
-        for (i = 0; i <= progress_bar_adv; i++)std::cout << "#";
+        for (i = 0; i <= progress_bar_adv; i++)
-        for (i = 0; i < 25 - progress_bar_adv; i++)std::cout << ".";
+            std::cout << "#";
+        for (i = 0; i < 25 - progress_bar_adv; i++)
+            std::cout << ".";
         std::cout << "]";
         last_progress = round(c / double(t) * 100);
     }
     return true;
 }
 
-bool HTTP::Download(const std::string &IP, const std::string &Path) {
+bool HTTP::Download(const std::string& IP, const std::string& Path) {
     static std::mutex Lock;
     std::scoped_lock Guard(Lock);
 
@@ -112,15 +156,16 @@ bool HTTP::Download(const std::string &IP, const std::string &Path) {
     std::string Ret = Get(IP);
     isDownload = false;
 
-    if(Ret.empty())return false;
+    if (Ret.empty())
+        return false;
 
     std::ofstream File(Path, std::ios::binary);
-    if(File.is_open()) {
+    if (File.is_open()) {
         File << Ret;
         File.close();
         std::cout << "\n";
         info("Download Complete!");
-    }else{
+    } else {
         error("Failed to open file directory: " + Path);
         return false;
     }

src/Network/Resources.cpp

@@ -7,146 +7,150 @@
 ///
 
 #include "Network/network.hpp"
+#include "fmt/core.h"
 
 #if defined(_WIN32)
 #include <ws2tcpip.h>
 #elif defined(__linux__)
-#include <sys/socket.h>
+#include <arpa/inet.h>
-#include <sys/types.h>
 #include <cstring>
 #include <errno.h>
 #include <netdb.h>
-#include <arpa/inet.h>
+#include <sys/socket.h>
+#include <sys/types.h>
 #endif
 
-#include <filesystem>
-#include "Startup.h"
 #include "Logger.h"
-#include <iostream>
+#include "Startup.h"
+#include <atomic>
+#include <cmath>
 #include <cstring>
+#include <filesystem>
 #include <fstream>
+#include <future>
+#include <asio.hpp>
+#include <iostream>
 #include <string>
 #include <thread>
-#include <atomic>
 #include <vector>
-#include <future>
-#include <cmath>
 
 namespace fs = std::filesystem;
 std::string ListOfMods;
-std::vector<std::string> Split(const std::string& String,const std::string& delimiter){
+std::vector<std::string> Split(const std::string& String, const std::string& delimiter) {
     std::vector<std::string> Val;
     size_t pos;
-    std::string token,s = String;
+    std::string token, s = String;
     while ((pos = s.find(delimiter)) != std::string::npos) {
         token = s.substr(0, pos);
-        if(!token.empty())Val.push_back(token);
+        if (!token.empty())
+            Val.push_back(token);
         s.erase(0, pos + delimiter.length());
     }
-    if(!s.empty())Val.push_back(s);
+    if (!s.empty())
+        Val.push_back(s);
     return Val;
 }
 
-void CheckForDir(){
+void CheckForDir() {
-    if(!fs::exists("Resources")){
+    if (!fs::exists("Resources")) {
-        // Could we just use fs::create_directory instead?
+// Could we just use fs::create_directory instead?
-        #if defined(_WIN32)
+#if defined(_WIN32)
         _wmkdir(L"Resources");
-        #elif defined(__linux__)
+#elif defined(__linux__)
         fs::create_directory(L"Resources");
-        #endif
+#endif
     }
 }
-void WaitForConfirm(){
+void WaitForConfirm() {
-    while(!Terminate && !ModLoaded){
+    while (!Terminate && !ModLoaded) {
         std::this_thread::sleep_for(std::chrono::milliseconds(10));
     }
     ModLoaded = false;
 }
 
-
+void Abord() {
-void Abord(){
     Terminate = true;
     TCPTerminate = true;
     info("Terminated!");
 }
 
-std::string Auth(SOCKET Sock){
+std::string Auth(asio::ip::tcp::socket& Sock) {
-    TCPSend("VC" + GetVer(),Sock);
+    TCPSend(strtovec("VC" + GetVer()), Sock);
 
     auto Res = TCPRcv(Sock);
 
-    if(Res.empty() || Res[0] == 'E' || Res[0] == 'K'){
+    if (Res.empty() || Res[0] == 'E' || Res[0] == 'K') {
         Abord();
         return "";
     }
 
-    TCPSend(PublicKey,Sock);
+    TCPSend(strtovec(PublicKey), Sock);
-    if(Terminate)return "";
+    if (Terminate)
+        return "";
 
     Res = TCPRcv(Sock);
-    if(Res.empty() || Res[0] != 'P'){
+    if (Res.empty() || Res[0] != 'P') {
         Abord();
         return "";
     }
 
     Res = Res.substr(1);
-    if(Res.find_first_not_of("0123456789") == std::string::npos){
+    if (Res.find_first_not_of("0123456789") == std::string::npos) {
         ClientID = std::stoi(Res);
-    }else{
+    } else {
         Abord();
         UUl("Authentication failed!");
         return "";
     }
-    TCPSend("SR",Sock);
+    TCPSend(strtovec("SR"), Sock);
-    if(Terminate)return "";
+    if (Terminate)
+        return "";
 
     Res = TCPRcv(Sock);
 
-    if(Res[0] == 'E' || Res[0] == 'K'){
+    if (Res[0] == 'E' || Res[0] == 'K') {
         Abord();
         return "";
     }
 
-    if(Res.empty() || Res == "-"){
+    if (Res.empty() || Res == "-") {
         info("Didn't Receive any mods...");
         ListOfMods = "-";
-        TCPSend("Done",Sock);
+        TCPSend(strtovec("Done"), Sock);
         info("Done!");
         return "";
     }
     return Res;
 }
 
-void UpdateUl(bool D,const std::string&msg){
+void UpdateUl(bool D, const std::string& msg) {
-    if(D)UlStatus = "UlDownloading Resource " + msg;
+    if (D)
-    else UlStatus = "UlLoading Resource " + msg;
+        UlStatus = "UlDownloading Resource " + msg;
+    else
+        UlStatus = "UlLoading Resource " + msg;
 }
 
-void AsyncUpdate(uint64_t& Rcv,uint64_t Size,const std::string& Name){
+void AsyncUpdate(uint64_t& Rcv, uint64_t Size, const std::string& Name) {
     do {
         double pr = double(Rcv) / double(Size) * 100;
         std::string Per = std::to_string(trunc(pr * 10) / 10);
         UpdateUl(true, Name + " (" + Per.substr(0, Per.find('.') + 2) + "%)");
         std::this_thread::sleep_for(std::chrono::milliseconds(100));
-    }while(!Terminate && Rcv < Size);
+    } while (!Terminate && Rcv < Size);
 }
 
-char* TCPRcvRaw(SOCKET Sock,uint64_t& GRcv, uint64_t Size){
+char* TCPRcvRaw(asio::ip::tcp::socket& Sock, uint64_t& GRcv, uint64_t Size) {
-    if(Sock == -1){
-        Terminate = true;
-        UUl("Invalid Socket");
-        return nullptr;
-    }
     char* File = new char[Size];
     uint64_t Rcv = 0;
-    do{
+    asio::error_code ec;
-        int Len = int(Size-Rcv);
+    do {
-        if(Len > 1000000)Len = 1000000;
+        int Len = int(Size - Rcv);
-        int32_t Temp = recv(Sock, &File[Rcv], Len, MSG_WAITALL);
+        if (Len > 1000000)
-        if(Temp < 1){
+            Len = 1000000;
-            info(std::to_string(Temp));
+        int32_t Temp = asio::read(Sock, asio::buffer(&File[Rcv], Len), ec);
-            UUl("Socket Closed Code 1");
+        if (ec) {
+            ::error(fmt::format("Failed to receive data from server: {}", ec.message()));
+            UUl("Failed to receive data from server, connection closed (Code 1)");
             KillSocket(Sock);
             Terminate = true;
             delete[] File;
@@ -154,32 +158,26 @@ char* TCPRcvRaw(SOCKET Sock,uint64_t& GRcv, uint64_t Size){
         }
         Rcv += Temp;
         GRcv += Temp;
-    }while(Rcv < Size && !Terminate);
+    } while (Rcv < Size && !Terminate);
     return File;
 }
-void MultiKill(SOCKET Sock,SOCKET Sock1){
+void MultiKill(asio::ip::tcp::socket& Sock, asio::ip::tcp::socket& Sock1) {
     KillSocket(Sock1);
     KillSocket(Sock);
     Terminate = true;
 }
-SOCKET InitDSock(){
+std::shared_ptr<asio::ip::tcp::socket> InitDSock(asio::ip::tcp::endpoint ep) {
-    SOCKET DSock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    auto DSock = std::make_shared<asio::ip::tcp::socket>(io);
-    SOCKADDR_IN ServerAddr;
+    asio::error_code ec;
-    if(DSock < 1){
+    DSock->connect(ep, ec);
+    if (ec) {
         KillSocket(DSock);
         Terminate = true;
-        return 0;
+        return nullptr;
     }
-    ServerAddr.sin_family = AF_INET;
+    char Code[2] = { 'D', char(ClientID) };
-    ServerAddr.sin_port = htons(LastPort);
+    asio::write(*DSock, asio::buffer(Code, 2), ec);
-    inet_pton(AF_INET, LastIP.c_str(), &ServerAddr.sin_addr);
+    if (ec) {
-    if(connect(DSock, (SOCKADDR *) &ServerAddr, sizeof(ServerAddr)) != 0){
-        KillSocket(DSock);
-        Terminate = true;
-        return 0;
-    }
-    char Code[2] = {'D',char(ClientID)};
-    if(send(DSock,Code,2,0) != 2){
         KillSocket(DSock);
         Terminate = true;
         return 0;
@@ -187,55 +185,56 @@ SOCKET InitDSock(){
     return DSock;
 }
 
-std::string MultiDownload(SOCKET MSock,SOCKET DSock, uint64_t Size, const std::string& Name){
+std::string MultiDownload(asio::ip::tcp::socket& MSock, asio::ip::tcp::socket& DSock, uint64_t Size, const std::string& Name) {
 
-    uint64_t GRcv = 0, MSize = Size/2, DSize = Size - MSize;
+    uint64_t GRcv = 0, MSize = Size / 2, DSize = Size - MSize;
 
-    std::thread Au(AsyncUpdate,std::ref(GRcv), Size, Name);
+    std::thread Au(AsyncUpdate, std::ref(GRcv), Size, Name);
 
-    std::packaged_task<char*()> task([&] { return TCPRcvRaw(MSock,GRcv,MSize); });
+    std::packaged_task<char*()> task([&] { return TCPRcvRaw(MSock, GRcv, MSize); });
     std::future<char*> f1 = task.get_future();
     std::thread Dt(std::move(task));
     Dt.detach();
 
-    char* DData = TCPRcvRaw(DSock,GRcv,DSize);
+    char* DData = TCPRcvRaw(DSock, GRcv, DSize);
 
-    if(!DData){
+    if (!DData) {
-        MultiKill(MSock,DSock);
+        MultiKill(MSock, DSock);
         return "";
     }
 
     f1.wait();
     char* MData = f1.get();
 
-    if(!MData){
+    if (!MData) {
-        MultiKill(MSock,DSock);
+        MultiKill(MSock, DSock);
         return "";
     }
 
-    if(Au.joinable())Au.join();
+    if (Au.joinable())
+        Au.join();
 
+    /// omg yes very ugly my god but i was in a rush will revisit
+    std::string Ret(Size, 0);
+    memcpy(&Ret[0], MData, MSize);
+    delete[] MData;
 
-    ///omg yes very ugly my god but i was in a rush will revisit
+    memcpy(&Ret[MSize], DData, DSize);
-    std::string Ret(Size,0);
+    delete[] DData;
-    memcpy(&Ret[0],MData,MSize);
-    delete[]MData;
-
-    memcpy(&Ret[MSize],DData,DSize);
-    delete[]DData;
 
     return Ret;
 }
 
-void InvalidResource(const std::string& File){
+void InvalidResource(const std::string& File) {
     UUl("Invalid mod \"" + File + "\"");
     warn("The server tried to sync \"" + File + "\" that is not a .zip file!");
     Terminate = true;
 }
 
-void SyncResources(SOCKET Sock){
+void SyncResources(asio::ip::tcp::socket& Sock) {
     std::string Ret = Auth(Sock);
-    if(Ret.empty())return;
+    if (Ret.empty())
+        return;
 
     info("Checking Resources...");
     CheckForDir();
@@ -246,54 +245,60 @@ void SyncResources(SOCKET Sock){
     list.clear();
     Ret.clear();
 
-    int Amount = 0,Pos = 0;
+    int Amount = 0, Pos = 0;
-    std::string a,t;
+    std::string a, t;
-    for(const std::string&name : FNames){
+    for (const std::string& name : FNames) {
-        if(!name.empty()){
+        if (!name.empty()) {
             t += name.substr(name.find_last_of('/') + 1) + ";";
         }
     }
-    if(t.empty())ListOfMods = "-";
+    if (t.empty())
-    else ListOfMods = t;
+        ListOfMods = "-";
+    else
+        ListOfMods = t;
     t.clear();
-    for(auto FN = FNames.begin(),FS = FSizes.begin(); FN != FNames.end() && !Terminate; ++FN,++FS) {
+    for (auto FN = FNames.begin(), FS = FSizes.begin(); FN != FNames.end() && !Terminate; ++FN, ++FS) {
         auto pos = FN->find_last_of('/');
         auto ZIP = FN->find(".zip");
         if (ZIP == std::string::npos || FN->length() - ZIP != 4) {
             InvalidResource(*FN);
             return;
         }
-        if (pos == std::string::npos)continue;
+        if (pos == std::string::npos)
+            continue;
         Amount++;
     }
-    if(!FNames.empty())info("Syncing...");
+    if (!FNames.empty())
-    SOCKET DSock = InitDSock();
+        info("Syncing...");
-    for(auto FN = FNames.begin(),FS = FSizes.begin(); FN != FNames.end() && !Terminate; ++FN,++FS) {
+    auto DSock = InitDSock(Sock.remote_endpoint());
+    for (auto FN = FNames.begin(), FS = FSizes.begin(); FN != FNames.end() && !Terminate; ++FN, ++FS) {
         auto pos = FN->find_last_of('/');
         if (pos != std::string::npos) {
             a = "Resources" + FN->substr(pos);
-        } else continue;
+        } else
+            continue;
         Pos++;
         if (fs::exists(a)) {
-            if (FS->find_first_not_of("0123456789") != std::string::npos)continue;
+            if (FS->find_first_not_of("0123456789") != std::string::npos)
-            if (fs::file_size(a) == std::stoull(*FS)){
+                continue;
-                UpdateUl(false,std::to_string(Pos) + "/" + std::to_string(Amount) + ": " + a.substr(a.find_last_of('/')));
+            if (fs::file_size(a) == std::stoull(*FS)) {
+                UpdateUl(false, std::to_string(Pos) + "/" + std::to_string(Amount) + ": " + a.substr(a.find_last_of('/')));
                 std::this_thread::sleep_for(std::chrono::milliseconds(50));
                 try {
-                    if(!fs::exists(GetGamePath() + "mods/multiplayer")){
+                    if (!fs::exists(GetGamePath() + "mods/multiplayer")) {
                         fs::create_directories(GetGamePath() + "mods/multiplayer");
                     }
-
+                    auto modname = a.substr(a.find_last_of('/'));
-                    std::string FName = a.substr(a.find_last_of('/'));
+#if defined(__linux__)
                     // Linux version of the game doesnt support uppercase letters in mod names
-                    #if defined(__linux__)
+                    for (char& c : modname) {
-                    for(char &c : FName){
                         c = ::tolower(c);
                     }
-                    #endif
+#endif
-
+                    auto name = GetGamePath() + "mods/multiplayer" + modname;
-                    fs::copy_file(a, GetGamePath() + "mods/multiplayer" + FName,
+                    auto tmp_name = name + ".tmp";
-                                  fs::copy_options::overwrite_existing);
+                    fs::copy_file(a, tmp_name, fs::copy_options::overwrite_existing);
+                    fs::rename(tmp_name, name);
                 } catch (std::exception& e) {
                     error("Failed copy to the mods folder! " + std::string(e.what()));
                     Terminate = true;
@@ -301,15 +306,16 @@ void SyncResources(SOCKET Sock){
                 }
                 WaitForConfirm();
                 continue;
-            }else remove(a.c_str());
+            } else
+                remove(a.c_str());
         }
         CheckForDir();
         std::string FName = a.substr(a.find_last_of('/'));
         do {
-            TCPSend("f" + *FN,Sock);
+            TCPSend(strtovec("f" + *FN), Sock);
 
             std::string Data = TCPRcv(Sock);
-            if (Data == "CO" || Terminate){
+            if (Data == "CO" || Terminate) {
                 Terminate = true;
                 UUl("Server cannot find " + FName);
                 break;
@@ -317,10 +323,11 @@ void SyncResources(SOCKET Sock){
 
             std::string Name = std::to_string(Pos) + "/" + std::to_string(Amount) + ": " + FName;
 
-            Data = MultiDownload(Sock,DSock,std::stoull(*FS), Name);
+            Data = MultiDownload(Sock, *DSock, std::stoull(*FS), Name);
 
-            if(Terminate)break;
+            if (Terminate)
-            UpdateUl(false,std::to_string(Pos)+"/"+std::to_string(Amount)+": "+FName);
+                break;
+            UpdateUl(false, std::to_string(Pos) + "/" + std::to_string(Amount) + ": " + FName);
             std::ofstream LFS;
             LFS.open(a.c_str(), std::ios_base::app | std::ios::binary);
             if (LFS.is_open()) {
@@ -328,29 +335,29 @@ void SyncResources(SOCKET Sock){
                 LFS.close();
             }
 
-        }while(fs::file_size(a) != std::stoull(*FS) && !Terminate);
+        } while (fs::file_size(a) != std::stoull(*FS) && !Terminate);
-        if(!Terminate){
+        if (!Terminate) {
-            if(!fs::exists(GetGamePath() + "mods/multiplayer")){
+            if (!fs::exists(GetGamePath() + "mods/multiplayer")) {
                 fs::create_directories(GetGamePath() + "mods/multiplayer");
             }
 
-            // Linux version of the game doesnt support uppercase letters in mod names
+// Linux version of the game doesnt support uppercase letters in mod names
-            #if defined(__linux__)
+#if defined(__linux__)
-            for(char &c : FName){
+            for (char& c : FName) {
                 c = ::tolower(c);
             }
-            #endif
+#endif
 
-            fs::copy_file(a,GetGamePath() + "mods/multiplayer" + FName, fs::copy_options::overwrite_existing);
+            fs::copy_file(a, GetGamePath() + "mods/multiplayer" + FName, fs::copy_options::overwrite_existing);
         }
         WaitForConfirm();
     }
     KillSocket(DSock);
-    if(!Terminate){
+    if (!Terminate) {
-        TCPSend("Done",Sock);
+        TCPSend(strtovec("Done"), Sock);
         info("Done!");
-    }else{
+    } else {
         UlStatus = "Ulstart";
         info("Connection Terminated!");
     }
-}
+}

src/Network/VehicleData.cpp

@@ -5,87 +5,98 @@
 ///
 /// Created by Anonymous275 on 5/8/2020
 ///
-#include "Zlib/Compressor.h"
 #include "Network/network.hpp"
+#include "Zlib/Compressor.h"
+#include "asio/ip/address.hpp"
+#include "fmt/format.h"
 
 #if defined(_WIN32)
 #include <ws2tcpip.h>
 #elif defined(__linux__)
+#include "linuxfixes.h"
+#include <arpa/inet.h>
+#include <cstring>
+#include <netdb.h>
 #include <sys/socket.h>
 #include <sys/types.h>
-#include <cstring>
-#include <errno.h>
-#include <netdb.h>
-#include <arpa/inet.h>
-#include "linuxfixes.h"
 #endif
 
 #include "Logger.h"
+#include <array>
 #include <string>
-#include <set>
 
-SOCKET UDPSock = -1;
+std::shared_ptr<asio::ip::udp::socket> UDPSock = nullptr;
-sockaddr_in* ToServer = nullptr;
 
-void UDPSend(std::string Data){
+void UDPSend(const std::vector<char>& RawData) {
-    if(ClientID == -1 || UDPSock == -1)return;
+    if (ClientID == -1 || UDPSock == nullptr)
-    if(Data.length() > 400){
+        return;
-        std::string CMP(Comp(Data));
+    std::string Data;
-        Data = "ABG:" + CMP;
+    if (Data.size() > 400) {
+        auto res = Comp(RawData);
+        Data = "ABG:" + std::string(res.data(), res.size());
+    } else {
+        Data = std::string(RawData.data(), RawData.size());
     }
-    std::string Packet = char(ClientID+1) + std::string(":") + Data;
+    std::string Packet = char(ClientID + 1) + std::string(":") + Data;
-    int sendOk = sendto(UDPSock, Packet.c_str(), int(Packet.size()), 0, (sockaddr*)ToServer, sizeof(*ToServer));
+    int sendOk = UDPSock->send(asio::buffer(Packet));
-    if (sendOk == SOCKET_ERROR)error("Error Code : " + std::to_string(WSAGetLastError()));
+    if (sendOk == SOCKET_ERROR)
+        error("Error Code : " + std::to_string(WSAGetLastError()));
 }
 
-
+void SendLarge(const std::vector<char>& Data) {
-void SendLarge(std::string Data){
+    if (Data.size() > 400) {
-    if(Data.length() > 400){
+        auto res = Comp(Data);
-        std::string CMP(Comp(Data));
+        res.insert(res.begin(), { 'A', 'B', 'G', ':' });
-        Data = "ABG:" + CMP;
+        if (!TCPSock) {
+            ::debug("TCPSock is null");
+            return;
+        }
+        TCPSend(res, *TCPSock);
+    } else {
+        if (!TCPSock) {
+            ::debug("TCPSock is null");
+            return;
+        }
+        TCPSend(Data, *TCPSock);
     }
-    TCPSend(Data,TCPSock);
 }
 
-void UDPParser(std::string Packet){
+void UDPParser(std::string_view Packet) {
-    if(Packet.substr(0,4) == "ABG:"){
+    if (Packet.substr(0, 4) == "ABG:") {
-        Packet = DeComp(Packet.substr(4));
+        auto substr = Packet.substr(4);
+        auto res = DeComp(std::span<const char>(substr.data(), substr.size()));
+        std::string DeCompPacket = std::string(res.data(), res.size());
+        ServerParser(DeCompPacket);
+    } else {
+        ServerParser(Packet);
     }
-    ServerParser(Packet);
 }
-void UDPRcv(){
+void UDPRcv() {
-    sockaddr_in FromServer{};
+    static thread_local std::array<char, 10240> Ret {};
-    #if defined(_WIN32)
+    if (UDPSock == nullptr) {
-    int clientLength = sizeof(FromServer);
+        ::debug("UDPSock is null");
-    #elif defined(__linux__)
-    socklen_t clientLength = sizeof(FromServer);
-    #endif
-    ZeroMemory(&FromServer, clientLength);
-    std::string Ret(10240,0);
-    if(UDPSock == -1)return;
-    int32_t Rcv = recvfrom(UDPSock, &Ret[0], 10240, 0, (sockaddr*)&FromServer, &clientLength);
-    if (Rcv == SOCKET_ERROR)return;
-    UDPParser(Ret.substr(0,Rcv));
-}
-void UDPClientMain(const std::string& IP,int Port){
-    #ifdef _WIN32
-    WSADATA data;
-    if (WSAStartup(514, &data)){
-        error("Can't start Winsock!");
         return;
     }
-    #endif
+    asio::error_code ec;
-    
+    int32_t Rcv = UDPSock->receive(asio::buffer(Ret.data(), Ret.size() - 1), 0, ec);
-    delete ToServer;
+    if (ec)
-    ToServer = new sockaddr_in;
+        return;
-    ToServer->sin_family = AF_INET;
+    Ret[Rcv] = 0;
-    ToServer->sin_port = htons(Port);
+    UDPParser(std::string_view(Ret.data(), Rcv));
-    inet_pton(AF_INET, IP.c_str(), &ToServer->sin_addr);
+}
-    UDPSock = socket(AF_INET, SOCK_DGRAM, 0);
+void UDPClientMain(asio::ip::address addr, uint16_t port) {
-    GameSend("P"+std::to_string(ClientID));
+    UDPSock = std::make_shared<asio::ip::udp::socket>(io);
-    TCPSend("H",TCPSock);
+    asio::error_code ec;
-    UDPSend("p");
+    UDPSock->connect(asio::ip::udp::endpoint(addr, port), ec);
-    while(!Terminate)UDPRcv();
+    if (ec) {
+        ::error(fmt::format("Failed to connect UDP to server: {}", ec.message()));
+        Terminate = true;
+    }
+    GameSend("P" + std::to_string(ClientID));
+    TCPSend(strtovec("H"), *TCPSock);
+    UDPSend(strtovec("p"));
+    while (!Terminate)
+        UDPRcv();
     KillSocket(UDPSock);
     WSACleanup();
-}
+}

src/Network/VehicleEvent.cpp

@@ -6,35 +6,36 @@
 /// Created by Anonymous275 on 5/8/2020
 ///
 
-#include <chrono>
-#include <vector>
 #include "Logger.h"
-#include <iostream>
+#include "fmt/format.h"
 #include <Zlib/Compressor.h>
+#include <chrono>
+#include <iostream>
+#include <vector>
 
 #if defined(_WIN32)
 #include <ws2tcpip.h>
 #elif defined(__linux__)
-#include <sys/socket.h>
+#include <arpa/inet.h>
-#include <sys/types.h>
 #include <cstring>
 #include <errno.h>
 #include <netdb.h>
-#include <arpa/inet.h>
+#include <sys/socket.h>
+#include <sys/types.h>
 #endif
 
 #include "Network/network.hpp"
 
 int LastPort;
 std::string LastIP;
-SOCKET TCPSock = -1;
+std::shared_ptr<asio::ip::tcp::socket> TCPSock = nullptr;
 
-bool CheckBytes(int32_t Bytes){
+bool CheckBytes(int32_t Bytes) {
-    if (Bytes == 0){
+    if (Bytes == 0) {
         debug("(TCP) Connection closing... CheckBytes(16)");
         Terminate = true;
         return false;
-    }else if (Bytes < 0) {
+    } else if (Bytes < 0) {
         debug("(TCP CB) recv failed with error: " + std::to_string(WSAGetLastError()));
         KillSocket(TCPSock);
         Terminate = true;
@@ -42,131 +43,87 @@ bool CheckBytes(int32_t Bytes){
     }
     return true;
 }
-void UUl(const std::string& R){
+void UUl(const std::string& R) {
     UlStatus = "UlDisconnected: " + R;
 }
 
-void TCPSend(const std::string&Data,uint64_t Sock){
+void TCPSend(const std::vector<char>& Data, asio::ip::tcp::socket& Sock) {
-   if(Sock == -1){
+    if (!Sock.is_open()) {
-       Terminate = true;
+        Terminate = true;
-       UUl("Invalid Socket");
+        UUl("Invalid Socket");
-       return;
+        return;
-   }
+    }
 
-   int32_t Size,Sent,Temp;
+    int32_t Size, Sent, Temp;
-   std::string Send(4,0);
+    std::string Send(4, 0);
-   Size = int32_t(Data.size());
+    Size = int32_t(Data.size());
-   memcpy(&Send[0],&Size,sizeof(Size));
+    memcpy(&Send[0], &Size, sizeof(Size));
-   Send += Data;
+    Send += std::string(Data.data(), Data.size());
-   // Do not use Size before this point for anything but the header
+    // Do not use Size before this point for anything but the header
-   Sent = 0;
+    Sent = 0;
-   Size += 4;
+    Size += 4;
-   do{
+    asio::error_code ec;
-       if (size_t(Sent) >= Send.size()) {
+    asio::write(Sock, asio::buffer(Send), ec);
-           error("string OOB in " + std::string(__func__));
+    if (ec) {
-           UUl("TCP Send OOB");
+        UUl(fmt::format("Failed to send data: {}", ec.message()));
-           return;
+    }
-       }
-       Temp = send(Sock, &Send[Sent], Size - Sent, 0);
-       if(!CheckBytes(Temp)){
-           UUl("Socket Closed Code 2");
-           return;
-       }
-       Sent += Temp;
-   }while(Sent < Size);
 }
 
-std::string TCPRcv(SOCKET Sock){
+std::string TCPRcv(asio::ip::tcp::socket& Sock) {
-    if(Sock == -1){
+    if (!Sock.is_open()) {
         Terminate = true;
         UUl("Invalid Socket");
         return "";
     }
-    int32_t Header,BytesRcv = 0,Temp;
+    int32_t Header, BytesRcv = 0, Temp;
     std::vector<char> Data(sizeof(Header));
-    do{
+    asio::error_code ec;
-        Temp = recv(Sock,&Data[BytesRcv],4-BytesRcv,0);
+    asio::read(Sock, asio::buffer(Data), ec);
-        if(!CheckBytes(Temp)){
+    if (ec) {
-            UUl("Socket Closed Code 3");
+        UUl(fmt::format("Failed to receive header: {}", ec.message()));
-            return "";
-        }
-        BytesRcv += Temp;
-    }while(BytesRcv < 4);
-    memcpy(&Header,&Data[0],sizeof(Header));
-
-    if(!CheckBytes(BytesRcv)){
-        UUl("Socket Closed Code 4");
-        return "";
     }
-    Data.resize(Header);
+    memcpy(&Header, &Data[0], sizeof(Header));
-    BytesRcv = 0;
-    do{
-        Temp = recv(Sock,&Data[BytesRcv],Header-BytesRcv,0);
-        if(!CheckBytes(Temp)){
-            UUl("Socket Closed Code 5");
-            return "";
-        }
-        BytesRcv += Temp;
-    }while(BytesRcv < Header);
 
-    std::string Ret(Data.data(),Header);
+    Data.resize(Header);
+    asio::read(Sock, asio::buffer(Data), ec);
+    if (ec) {
+        UUl(fmt::format("Failed to receive data: {}", ec.message()));
+    }
+
+    std::string Ret(Data.data(), Header);
 
     if (Ret.substr(0, 4) == "ABG:") {
-        Ret = DeComp(Ret.substr(4));
+        auto substr = Ret.substr(4);
+        auto res = DeComp(strtovec(substr));
+        Ret = std::string(res.data(), res.size());
     }
 
 #ifdef DEBUG
-    //debug("Parsing from server -> " + std::to_string(Ret.size()));
+    // debug("Parsing from server -> " + std::to_string(Ret.size()));
 #endif
-    if(Ret[0] == 'E' || Ret[0] == 'K')UUl(Ret.substr(1));
+    if (Ret[0] == 'E' || Ret[0] == 'K')
+        UUl(Ret.substr(1));
     return Ret;
 }
 
-void TCPClientMain(const std::string& IP,int Port){
+void TCPClientMain(asio::ip::tcp::socket&& socket) {
-    LastIP = IP;
+    if (!TCPSock) {
-    LastPort = Port;
+        return;
+    }
+    LastIP = socket.remote_endpoint().address().to_string();
+    LastPort = socket.remote_endpoint().port();
     SOCKADDR_IN ServerAddr;
     int RetCode;
-    #ifdef _WIN32
+    TCPSock = std::make_shared<asio::ip::tcp::socket>(std::move(socket));
-    WSADATA wsaData;
-    WSAStartup(514, &wsaData); //2.2
-    #endif
-    TCPSock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 
-    if(TCPSock == -1){
-        printf("Client: socket failed! Error code: %d\n", WSAGetLastError());
-        WSACleanup();
-        return;
-    }
-
-    ServerAddr.sin_family = AF_INET;
-    ServerAddr.sin_port = htons(Port);
-    inet_pton(AF_INET, IP.c_str(), &ServerAddr.sin_addr);
-    RetCode = connect(TCPSock, (SOCKADDR *) &ServerAddr, sizeof(ServerAddr));
-    if(RetCode != 0){
-        UlStatus = "UlConnection Failed!";
-        error("Client: connect failed! Error code: " + std::to_string(WSAGetLastError()));
-        KillSocket(TCPSock);
-        WSACleanup();
-        Terminate = true;
-        return;
-    }
     info("Connected!");
 
     char Code = 'C';
-    send(TCPSock, &Code, 1, 0);
+    asio::write(*TCPSock, asio::buffer(&Code, 1));
-    SyncResources(TCPSock);
+    SyncResources(*TCPSock);
-    while(!Terminate){
+    while (!Terminate && TCPSock) {
-        ServerParser(TCPRcv(TCPSock));
+        ServerParser(TCPRcv(*TCPSock));
     }
     GameSend("T");
-    ////Game Send Terminate
+    KillSocket(TCPSock);
-    if(KillSocket(TCPSock) != 0)
-        debug("(TCP) Cannot close socket. Error code: " + std::to_string(WSAGetLastError()));
-
-    #ifdef _WIN32
-    if(WSACleanup() != 0)
-        debug("(TCP) Client: WSACleanup() failed!...");
-    #endif
-
 }

src/NetworkHelpers.cpp

@@ -0,0 +1,35 @@
+#include "NetworkHelpers.h"
+
+#include <array>
+#include <cerrno>
+#include <cstring>
+#include <stdexcept>
+
+using asio::ip::tcp;
+
+static uint32_t RecvHeader(tcp::socket& socket) {
+    std::array<uint8_t, sizeof(uint32_t)> header_buffer {};
+    asio::error_code ec;
+    auto n = asio::read(socket, asio::buffer(header_buffer), ec);
+    if (ec) {
+        throw std::runtime_error(std::string("recv() of header failed: ") + ec.message());
+    }
+    if (n == 0) {
+        throw std::runtime_error("Game disconnected");
+    }
+    return *reinterpret_cast<uint32_t*>(header_buffer.data());
+}
+
+/// Throws!!!
+void ReceiveFromGame(tcp::socket& socket, std::vector<char>& out_data) {
+    auto header = RecvHeader(socket);
+    out_data.resize(header);
+    asio::error_code ec;
+    auto n = asio::read(socket, asio::buffer(out_data), ec);
+    if (ec) {
+        throw std::runtime_error(std::string("recv() of data failed: ") + ec.message());
+    }
+    if (n == 0) {
+        throw std::runtime_error("Game disconnected");
+    }
+}

src/Security/BeamNG.cpp

@@ -11,9 +11,9 @@
 #include <windows.h>
 #elif defined(__linux__)
 #include "vdf_parser.hpp"
-#include <vector>
 #include <pwd.h>
 #include <unistd.h>
+#include <vector>
 #endif
 #include "Logger.h"
 #include <fstream>
@@ -27,11 +27,10 @@
 int TraceBack = 0;
 std::string GameDir;
 
-void lowExit(int code){
+void lowExit(int code) {
     TraceBack = 0;
-    std::string msg =
+    std::string msg = "Failed to find the game please launch it. Report this if the issue persists code ";
-   "Failed to find the game please launch it. Report this if the issue persists code ";
+    error(msg + std::to_string(code));
-    error(msg+std::to_string(code));
     std::this_thread::sleep_for(std::chrono::seconds(10));
     exit(2);
 }
@@ -51,124 +50,136 @@ void SteamExit(int code){
     std::this_thread::sleep_for(std::chrono::seconds(10));
     exit(4);
 }*/
-std::string GetGameDir(){
+std::string GetGameDir() {
-    //if(TraceBack != 4)Exit(0);
+// if(TraceBack != 4)Exit(0);
-    #if defined(_WIN32)
+#if defined(_WIN32)
-    return GameDir.substr(0,GameDir.find_last_of('\\'));
+    return GameDir.substr(0, GameDir.find_last_of('\\'));
-    #elif defined(__linux__)
+#elif defined(__linux__)
-    return GameDir.substr(0,GameDir.find_last_of('/'));
+    return GameDir.substr(0, GameDir.find_last_of('/'));
-    #endif
+#endif
 }
 #ifdef _WIN32
-LONG OpenKey(HKEY root,const char* path,PHKEY hKey){
+LONG OpenKey(HKEY root, const char* path, PHKEY hKey) {
     return RegOpenKeyEx(root, reinterpret_cast<LPCSTR>(path), 0, KEY_READ, hKey);
 }
-std::string QueryKey(HKEY hKey,int ID){
+std::string QueryKey(HKEY hKey, int ID) {
-    TCHAR    achKey[MAX_KEY_LENGTH];   // buffer for subkey name
+    TCHAR achKey[MAX_KEY_LENGTH]; // buffer for subkey name
-    DWORD    cbName;                   // size of name string
+    DWORD cbName; // size of name string
-    TCHAR    achClass[MAX_PATH] = TEXT("");  // buffer for class name
+    TCHAR achClass[MAX_PATH] = TEXT(""); // buffer for class name
-    DWORD    cchClassName = MAX_PATH;  // size of class string
+    DWORD cchClassName = MAX_PATH; // size of class string
-    DWORD    cSubKeys=0;               // number of subkeys
+    DWORD cSubKeys = 0; // number of subkeys
-    DWORD    cbMaxSubKey;              // longest subkey size
+    DWORD cbMaxSubKey; // longest subkey size
-    DWORD    cchMaxClass;              // longest class string
+    DWORD cchMaxClass; // longest class string
-    DWORD    cValues;              // number of values for key
+    DWORD cValues; // number of values for key
-    DWORD    cchMaxValue;          // longest value name
+    DWORD cchMaxValue; // longest value name
-    DWORD    cbMaxValueData;       // longest value data
+    DWORD cbMaxValueData; // longest value data
-    DWORD    cbSecurityDescriptor; // size of security descriptor
+    DWORD cbSecurityDescriptor; // size of security descriptor
-    FILETIME ftLastWriteTime;      // last write time
+    FILETIME ftLastWriteTime; // last write time
 
     DWORD i, retCode;
 
-    TCHAR  achValue[MAX_VALUE_NAME];
+    TCHAR achValue[MAX_VALUE_NAME];
     DWORD cchValue = MAX_VALUE_NAME;
 
     retCode = RegQueryInfoKey(
-            hKey,                    // key handle
+        hKey, // key handle
-            achClass,                // buffer for class name
+        achClass, // buffer for class name
-            &cchClassName,           // size of class string
+        &cchClassName, // size of class string
-            nullptr,                    // reserved
+        nullptr, // reserved
-            &cSubKeys,               // number of subkeys
+        &cSubKeys, // number of subkeys
-            &cbMaxSubKey,            // longest subkey size
+        &cbMaxSubKey, // longest subkey size
-            &cchMaxClass,            // longest class string
+        &cchMaxClass, // longest class string
-            &cValues,                // number of values for this key
+        &cValues, // number of values for this key
-            &cchMaxValue,            // longest value name
+        &cchMaxValue, // longest value name
-            &cbMaxValueData,         // longest value data
+        &cbMaxValueData, // longest value data
-            &cbSecurityDescriptor,   // security descriptor
+        &cbSecurityDescriptor, // security descriptor
-            &ftLastWriteTime);       // last write time
+        &ftLastWriteTime); // last write time
 
     BYTE* buffer = new BYTE[cbMaxValueData];
     ZeroMemory(buffer, cbMaxValueData);
-    if (cSubKeys){
+    if (cSubKeys) {
-        for (i=0; i<cSubKeys; i++){
+        for (i = 0; i < cSubKeys; i++) {
             cbName = MAX_KEY_LENGTH;
-            retCode = RegEnumKeyEx(hKey, i,achKey,&cbName,nullptr,nullptr,nullptr,&ftLastWriteTime);
+            retCode = RegEnumKeyEx(hKey, i, achKey, &cbName, nullptr, nullptr, nullptr, &ftLastWriteTime);
-            if (retCode == ERROR_SUCCESS){
+            if (retCode == ERROR_SUCCESS) {
-                if(strcmp(achKey,"Steam App 284160") == 0){
+                if (strcmp(achKey, "Steam App 284160") == 0) {
                     return achKey;
                 }
             }
         }
     }
-    if (cValues){
+    if (cValues) {
-        for (i=0, retCode = ERROR_SUCCESS; i<cValues; i++){
+        for (i = 0, retCode = ERROR_SUCCESS; i < cValues; i++) {
             cchValue = MAX_VALUE_NAME;
             achValue[0] = '\0';
-            retCode = RegEnumValue(hKey, i,achValue,&cchValue,nullptr,nullptr,nullptr,nullptr);
+            retCode = RegEnumValue(hKey, i, achValue, &cchValue, nullptr, nullptr, nullptr, nullptr);
-            if (retCode == ERROR_SUCCESS ){
+            if (retCode == ERROR_SUCCESS) {
                 DWORD lpData = cbMaxValueData;
                 buffer[0] = '\0';
                 LONG dwRes = RegQueryValueEx(hKey, achValue, nullptr, nullptr, buffer, &lpData);
-                std::string data = (char *)(buffer);
+                std::string data = (char*)(buffer);
                 std::string key = achValue;
 
-                switch (ID){
+                switch (ID) {
-                    case 1: if(key == "SteamExe"){
+                case 1:
-                                auto p = data.find_last_of("/\\");
+                    if (key == "SteamExe") {
-                                if(p != std::string::npos){
+                        auto p = data.find_last_of("/\\");
-                                    return data.substr(0,p);
+                        if (p != std::string::npos) {
-                                }
+                            return data.substr(0, p);
-                            }
+                        }
-                            break;
+                    }
-                    case 2: if(key == "Name" && data == "BeamNG.drive")return data;break;
+                    break;
-                    case 3: if(key == "rootpath")return data;break;
+                case 2:
-                    case 4: if(key == "userpath_override")return data;
+                    if (key == "Name" && data == "BeamNG.drive")
-                    case 5: if(key == "Local AppData")return data;
+                        return data;
-                    default: break;
+                    break;
+                case 3:
+                    if (key == "rootpath")
+                        return data;
+                    break;
+                case 4:
+                    if (key == "userpath_override")
+                        return data;
+                case 5:
+                    if (key == "Local AppData")
+                        return data;
+                default:
+                    break;
                 }
             }
         }
     }
-    delete [] buffer;
+    delete[] buffer;
     return "";
 }
 #endif
 
 namespace fs = std::filesystem;
 
-bool NameValid(const std::string& N){
+bool NameValid(const std::string& N) {
-    if(N == "config" || N == "librarycache"){
+    if (N == "config" || N == "librarycache") {
         return true;
     }
-    if(N.find_first_not_of("0123456789") == std::string::npos){
+    if (N.find_first_not_of("0123456789") == std::string::npos) {
         return true;
     }
     return false;
 }
-void FileList(std::vector<std::string>&a,const std::string& Path){
+void FileList(std::vector<std::string>& a, const std::string& Path) {
-    for (const auto &entry : fs::directory_iterator(Path)) {
+    for (const auto& entry : fs::directory_iterator(Path)) {
         const auto& DPath = entry.path();
         if (!entry.is_directory()) {
-            a.emplace_back(DPath.u8string());
+            a.emplace_back(DPath.string());
-        }else if(NameValid(DPath.filename().u8string())){
+        } else if (NameValid(DPath.filename().string())) {
-            FileList(a, DPath.u8string());
+            FileList(a, DPath.string());
         }
     }
 }
-bool Find(const std::string& FName,const std::string& Path){
+bool Find(const std::string& FName, const std::string& Path) {
     std::vector<std::string> FS;
-    FileList(FS,Path+"\\userdata");
+    FileList(FS, Path + "\\userdata");
-    for(std::string&a : FS){
+    for (std::string& a : FS) {
-        if(a.find(FName) != std::string::npos){
+        if (a.find(FName) != std::string::npos) {
             FS.clear();
             return true;
         }
@@ -176,22 +187,24 @@ bool Find(const std::string& FName,const std::string& Path){
     FS.clear();
     return false;
 }
-bool FindHack(const std::string& Path){
+bool FindHack(const std::string& Path) {
     bool s = true;
-    for (const auto &entry : fs::directory_iterator(Path)) {
+    for (const auto& entry : fs::directory_iterator(Path)) {
-        std::string Name = entry.path().filename().u8string();
+        std::string Name = entry.path().filename().string();
-        for(char&c : Name)c = char(tolower(c));
+        for (char& c : Name)
-        if(Name == "steam.exe")s = false;
+            c = char(tolower(c));
-        if(Name.find("greenluma") != -1){
+        if (Name == "steam.exe")
-            error("Found malicious file/folder \"" + Name+"\"");
+            s = false;
+        if (Name.find("greenluma") != -1) {
+            error("Found malicious file/folder \"" + Name + "\"");
             return true;
         }
         Name.clear();
     }
     return s;
 }
-std::vector<std::string> GetID(const std::string& log){
+std::vector<std::string> GetID(const std::string& log) {
-    std::string vec,t,r;
+    std::string vec, t, r;
     std::vector<std::string> Ret;
     std::ifstream f(log.c_str(), std::ios::binary);
     f.seekg(0, std::ios_base::end);
@@ -203,10 +216,12 @@ std::vector<std::string> GetID(const std::string& log){
     std::stringstream ss(vec);
     bool S = false;
     while (std::getline(ss, t, '{')) {
-        if(!S)S = true;
+        if (!S)
-        else{
+            S = true;
-            for(char& c : t){
+        else {
-                if(isdigit(c))r += c;
+            for (char& c : t) {
+                if (isdigit(c))
+                    r += c;
             }
             break;
         }
@@ -216,15 +231,16 @@ std::vector<std::string> GetID(const std::string& log){
     S = false;
     bool L = true;
     while (std::getline(ss, t, '}')) {
-        if(L){
+        if (L) {
             L = false;
             continue;
         }
-        for(char& c : t){
+        for (char& c : t) {
-            if(c == '"'){
+            if (c == '"') {
-                if(!S)S = true;
+                if (!S)
-                else{
+                    S = true;
-                    if(r.length() > 10) {
+                else {
+                    if (r.length() > 10) {
                         Ret.emplace_back(r);
                     }
                     r.clear();
@@ -232,13 +248,14 @@ std::vector<std::string> GetID(const std::string& log){
                     continue;
                 }
             }
-            if(isdigit(c))r += c;
+            if (isdigit(c))
+                r += c;
         }
     }
     vec.clear();
     return Ret;
 }
-std::string GetManifest(const std::string& Man){
+std::string GetManifest(const std::string& Man) {
     std::string vec;
     std::ifstream f(Man.c_str(), std::ios::binary);
     f.seekg(0, std::ios_base::end);
@@ -249,103 +266,109 @@ std::string GetManifest(const std::string& Man){
     f.close();
     std::string ToFind = "\"LastOwner\"\t\t\"";
     int pos = int(vec.find(ToFind));
-    if(pos != -1){
+    if (pos != -1) {
         pos += int(ToFind.length());
         vec = vec.substr(pos);
-        return vec.substr(0,vec.find('\"'));
+        return vec.substr(0, vec.find('\"'));
-    }else return "";
+    } else
+        return "";
 }
-bool IDCheck(std::string Man, std::string steam){
+bool IDCheck(std::string Man, std::string steam) {
-    bool a = false,b = true;
+    bool a = false, b = true;
     int pos = int(Man.rfind("steamapps"));
-  //  if(pos == -1)Exit(5);
+    //  if(pos == -1)Exit(5);
-    Man = Man.substr(0,pos+9) + "\\appmanifest_284160.acf";
+    Man = Man.substr(0, pos + 9) + "\\appmanifest_284160.acf";
     steam += "\\config\\loginusers.vdf";
-    if(fs::exists(Man) && fs::exists(steam)){
+    if (fs::exists(Man) && fs::exists(steam)) {
-        for(const std::string&ID : GetID(steam)){
+        for (const std::string& ID : GetID(steam)) {
-            if(ID == GetManifest(Man))b = false;
+            if (ID == GetManifest(Man))
+                b = false;
         }
-        //if(b)Exit(6);
+        // if(b)Exit(6);
-    }else a = true;
+    } else
+        a = true;
     return a;
 }
-void LegitimacyCheck(){
+void LegitimacyCheck() {
 
-    //std::string K1 = R"(Software\Valve\Steam)";
+// std::string K1 = R"(Software\Valve\Steam)";
-    //std::string K2 = R"(Software\Valve\Steam\Apps\284160)";
+// std::string K2 = R"(Software\Valve\Steam\Apps\284160)";
 
-    /*LONG dwRegOPenKey = OpenKey(HKEY_CURRENT_USER, K1.c_str(), &hKey);
+/*LONG dwRegOPenKey = OpenKey(HKEY_CURRENT_USER, K1.c_str(), &hKey);
 
-    if(dwRegOPenKey == ERROR_SUCCESS) {
+if(dwRegOPenKey == ERROR_SUCCESS) {
-        Result = QueryKey(hKey, 1);
+    Result = QueryKey(hKey, 1);
-        if(Result.empty())Exit(1);
+    if(Result.empty())Exit(1);
 
-        if(fs::exists(Result)){
+    if(fs::exists(Result)){
-            if(!Find("284160.json",Result))Exit(2);
+        if(!Find("284160.json",Result))Exit(2);
-            if(FindHack(Result))SteamExit(1);
+        if(FindHack(Result))SteamExit(1);
-        }else Exit(3);
+    }else Exit(3);
 
-        T = Result;
+    T = Result;
-        Result.clear();
+    Result.clear();
-        TraceBack++;
+    TraceBack++;
-    }else Exit(4);
+}else Exit(4);
 
-    K1.clear();
+K1.clear();
-    RegCloseKey(hKey);
+RegCloseKey(hKey);
-    dwRegOPenKey = OpenKey(HKEY_CURRENT_USER, K2.c_str(), &hKey);
+dwRegOPenKey = OpenKey(HKEY_CURRENT_USER, K2.c_str(), &hKey);
-    if(dwRegOPenKey == ERROR_SUCCESS) {
+if(dwRegOPenKey == ERROR_SUCCESS) {
-        Result = QueryKey(hKey, 2);
+    Result = QueryKey(hKey, 2);
-        if(Result.empty())lowExit(1);
+    if(Result.empty())lowExit(1);
-        TraceBack++;
+    TraceBack++;
-    }else lowExit(2);
+}else lowExit(2);
-    K2.clear();
+K2.clear();
-    RegCloseKey(hKey);*/
+RegCloseKey(hKey);*/
-    #if defined(_WIN32)
+#if defined(_WIN32)
     std::string Result;
     std::string K3 = R"(Software\BeamNG\BeamNG.drive)";
     HKEY hKey;
     LONG dwRegOPenKey = OpenKey(HKEY_CURRENT_USER, K3.c_str(), &hKey);
-    if(dwRegOPenKey == ERROR_SUCCESS) {
+    if (dwRegOPenKey == ERROR_SUCCESS) {
         Result = QueryKey(hKey, 3);
-        if(Result.empty())lowExit(3);
+        if (Result.empty())
-        //if(IDCheck(Result,T))lowExit(5);
+            lowExit(3);
+        // if(IDCheck(Result,T))lowExit(5);
         GameDir = Result;
-        //TraceBack++;
+        // TraceBack++;
-    }else lowExit(4);
+    } else
+        lowExit(4);
     K3.clear();
     Result.clear();
     RegCloseKey(hKey);
-    //if(TraceBack < 3)exit(-1);
+// if(TraceBack < 3)exit(-1);
-    #elif defined(__linux__)
+#elif defined(__linux__)
-    struct passwd *pw = getpwuid(getuid());
+    struct passwd* pw = getpwuid(getuid());
     std::string homeDir = pw->pw_dir;
     // Right now only steam is supported
     std::ifstream libraryFolders(homeDir + "/.steam/root/steamapps/libraryfolders.vdf");
     auto root = tyti::vdf::read(libraryFolders);
 
-    for (auto folderInfo: root.childs){
+    for (auto folderInfo : root.childs) {
-        if (std::filesystem::exists(folderInfo.second->attribs["path"] + "/steamapps/common/BeamNG.drive/")){
+        if (std::filesystem::exists(folderInfo.second->attribs["path"] + "/steamapps/common/BeamNG.drive/")) {
             GameDir = folderInfo.second->attribs["path"] + "/steamapps/common/BeamNG.drive/";
             break;
         }
     }
-    #endif
+#endif
 }
-std::string CheckVer(const std::string &dir){
+std::string CheckVer(const std::string& dir) {
-    #if defined(_WIN32)
+#if defined(_WIN32)
-    std::string temp,Path = dir + "\\integrity.json";
+    std::string temp, Path = dir + "\\integrity.json";
-    #elif defined(__linux__)
+#elif defined(__linux__)
-    std::string temp,Path = dir + "/integrity.json";
+    std::string temp, Path = dir + "/integrity.json";
-    #endif
+#endif
     std::ifstream f(Path.c_str(), std::ios::binary);
     int Size = int(std::filesystem::file_size(Path));
-    std::string vec(Size,0);
+    std::string vec(Size, 0);
     f.read(&vec[0], Size);
     f.close();
 
-    vec = vec.substr(vec.find_last_of("version"),vec.find_last_of('"'));
+    vec = vec.substr(vec.find_last_of("version"), vec.find_last_of('"'));
-    for(const char &a : vec){
+    for (const char& a : vec) {
-        if(isdigit(a) || a == '.')temp+=a;
+        if (isdigit(a) || a == '.')
+            temp += a;
     }
     return temp;
 }

src/Security/Login.cpp

@@ -1,122 +1,143 @@
-// Copyright (c) 2019-present Anonymous275.
+// Copyright (c) 2019-present Anonymous275.
-// BeamMP Launcher code is not in the public domain and is not free software.
+// BeamMP Launcher code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
+// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
+// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
+///
-/// Created by Anonymous275 on 11/26/2020
+/// Created by Anonymous275 on 11/26/2020
-///
+///
-
+
-#include "Http.h"
+#include "Http.h"
-#include <filesystem>
+#include "Logger.h"
-#include "Logger.h"
+#include <filesystem>
-#include <fstream>
+#include <fstream>
-#include "Json.h"
+#include <nlohmann/json.hpp>
-
+
-namespace fs = std::filesystem;
+namespace fs = std::filesystem;
-std::string PublicKey;
+std::string PublicKey;
-extern bool LoginAuth;
+std::string PrivateKey;
-std::string Role;
+extern bool LoginAuth;
-
+extern std::string Username;
-void UpdateKey(const char* newKey){
+extern std::string UserRole;
-    if(newKey && std::isalnum(newKey[0])){
+
-        std::ofstream Key("key");
+void UpdateKey(const char* newKey) {
-        if(Key.is_open()){
+    if (newKey && std::isalnum(newKey[0])) {
-            Key << newKey;
+        PrivateKey = newKey;
-            Key.close();
+        std::ofstream Key("key");
-        }else fatal("Cannot write to disk!");
+        if (Key.is_open()) {
-    }else if(fs::exists("key")){
+            Key << newKey;
-        remove("key");
+            Key.close();
-    }
+        } else
-}
+            fatal("Cannot write to disk!");
-
+    } else if (fs::exists("key")) {
-/// "username":"value","password":"value"
+        remove("key");
-/// "Guest":"Name"
+    }
-/// "pk":"private_key"
+}
-
+
-std::string GetFail(const std::string& R){
+/// "username":"value","password":"value"
-    std::string DRet = R"({"success":false,"message":)";
+/// "Guest":"Name"
-    DRet += "\""+R+"\"}";
+/// "pk":"private_key"
-    error(R);
+
-    return DRet;
+std::string GetFail(const std::string& R) {
-}
+    std::string DRet = R"({"success":false,"message":)";
-
+    DRet += "\"" + R + "\"}";
-std::string Login(const std::string& fields){
+    error(R);
-    if(fields == "LO"){
+    return DRet;
-        LoginAuth = false;
+}
-        UpdateKey(nullptr);
+
-        return "";
+std::string Login(const std::string& fields) {
-    }
+    if (fields == "LO") {
-    info("Attempting to authenticate...");
+        Username = "";
-    std::string Buffer = HTTP::Post("https://auth.beammp.com/userlogin", fields);
+        UserRole = "";
-    json::Document d;
+        LoginAuth = false;
-    d.Parse(Buffer.c_str());
+        UpdateKey(nullptr);
-    if(Buffer == "-1"){
+        return "";
-        return GetFail("Failed to communicate with the auth system!");
+    }
-    }
+    info("Attempting to authenticate...");
-
+    try {
-    if (Buffer.at(0) != '{' || d.HasParseError()) {
+        std::string Buffer = HTTP::Post("https://auth.beammp.com/userlogin", fields);
-        error(Buffer);
+
-        return GetFail("Invalid answer from authentication servers, please try again later!");
+        if (Buffer == "-1") {
-    }
+            return GetFail("Failed to communicate with the auth system!");
-    if(d.HasMember("success") && !d["success"].IsNull() && d["success"].GetBool()){
+        }
-        LoginAuth = true;
+
-        if(d.HasMember("private_key") && !d["private_key"].IsNull()){
+        nlohmann::json d = nlohmann::json::parse(Buffer, nullptr, false);
-            UpdateKey(d["private_key"].GetString());
+
-        }
+        if (Buffer.at(0) != '{' || d.is_discarded()) {
-        if(d.HasMember("public_key") && !d["public_key"].IsNull()){
+            error(Buffer);
-            PublicKey = d["public_key"].GetString();
+            return GetFail("Invalid answer from authentication servers, please try again later!");
-        }
+        }
-        info("Authentication successful!");
+        if (d.contains("success") && d["success"].get<bool>()) {
-    }else info("Authentication failed!");
+            LoginAuth = true;
-    if(d.HasMember("message") && !d["message"].IsNull()){
+            if (d.contains("username")) {
-        d.RemoveMember("private_key");
+                Username = d["username"].get<std::string>();
-        d.RemoveMember("public_key");
+            }
-        rapidjson::StringBuffer buffer;
+            if (d.contains("role")) {
-        rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+                UserRole = d["role"].get<std::string>();
-        d.Accept(writer);
+            }
-        return buffer.GetString();
+            if (d.contains("private_key")) {
-    }
+                UpdateKey(d["private_key"].get<std::string>().c_str());
-    return GetFail("Invalid message parsing!");
+            }
-}
+            if (d.contains("public_key")) {
-
+                PublicKey = d["public_key"].get<std::string>();
-void CheckLocalKey(){
+            }
-    if(fs::exists("key") && fs::file_size("key") < 100){
+            info("Authentication successful!");
-        std::ifstream Key("key");
+        } else
-        if(Key.is_open()) {
+            info("Authentication failed!");
-            auto Size = fs::file_size("key");
+        if (d.contains("message")) {
-            std::string Buffer(Size, 0);
+            d.erase("private_key");
-            Key.read(&Buffer[0], Size);
+            d.erase("public_key");
-            Key.close();
+            return d.dump();
-
+        }
-            for (char& c : Buffer) {
+        return GetFail("Invalid message parsing!");
-              if (!std::isalnum(c) && c != '-') {
+    } catch (const std::exception& e) {
-                UpdateKey(nullptr);
+        return GetFail(e.what());
-                return;
+    }
-              }
+}
-            }
+
-
+void CheckLocalKey() {
-            Buffer = HTTP::Post("https://auth.beammp.com/userlogin", R"({"pk":")" + Buffer + "\"}");
+    if (fs::exists("key") && fs::file_size("key") < 100) {
-
+        std::ifstream Key("key");
-            json::Document d;
+        if (Key.is_open()) {
-            d.Parse(Buffer.c_str());
+            auto Size = fs::file_size("key");
-            if (Buffer == "-1" || Buffer.at(0) != '{' || d.HasParseError()) {
+            std::string Buffer(Size, 0);
-                error(Buffer);
+            Key.read(&Buffer[0], Size);
-                info("Invalid answer from authentication servers.");
+            Key.close();
-                UpdateKey(nullptr);
+
-            }
+            for (char& c : Buffer) {
-            if(d.HasMember("success") && d["success"].GetBool()){
+                if (!std::isalnum(c) && c != '-') {
-                LoginAuth = true;
+                    UpdateKey(nullptr);
-                UpdateKey(d["private_key"].GetString());
+                    return;
-                PublicKey = d["public_key"].GetString();
+                }
-                Role = d["role"].GetString();
+            }
-                //info(Role);
+
-            }else{
+            Buffer = HTTP::Post("https://auth.beammp.com/userlogin", R"({"pk":")" + Buffer + "\"}");
-                info("Auto-Authentication unsuccessful please re-login!");
+
-                UpdateKey(nullptr);
+            nlohmann::json d = nlohmann::json::parse(Buffer, nullptr, false);
-            }
+
-        }else{
+            if (Buffer == "-1" || Buffer.at(0) != '{' || d.is_discarded()) {
-            warn("Could not open saved key!");
+                error(Buffer);
-            UpdateKey(nullptr);
+                info("Invalid answer from authentication servers.");
-        }
+                UpdateKey(nullptr);
-    }else UpdateKey(nullptr);
+            }
-}
+            if (d["success"].get<bool>()) {
+                LoginAuth = true;
+                UpdateKey(d["private_key"].get<std::string>().c_str());
+                PublicKey = d["public_key"].get<std::string>();
+                if (d.contains("username")) {
+                    Username = d["username"].get<std::string>();
+                }
+                if (d.contains("role")) {
+                    UserRole = d["role"].get<std::string>();
+                }
+                // info(Role);
+            } else {
+                info("Auto-Authentication unsuccessful please re-login!");
+                UpdateKey(nullptr);
+            }
+        } else {
+            warn("Could not open saved key!");
+            UpdateKey(nullptr);
+        }
+    } else
+        UpdateKey(nullptr);
+}

src/Startup.cpp

@@ -1,339 +1,432 @@
-// Copyright (c) 2019-present Anonymous275.
+// Copyright (c) 2019-present Anonymous275.
-// BeamMP Launcher code is not in the public domain and is not free software.
+// BeamMP Launcher code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
+// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
+// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
+///
-/// Created by Anonymous275 on 7/16/2020
+/// Created by Anonymous275 on 7/16/2020
-///
+///
-#include "zip_file.h"
+
-#include <string>
+#include "zip_file.h"
-#if defined(_WIN32)
+#include <charconv>
-#include <windows.h>
+#include <httplib.h>
-#elif defined(__linux__)
+#include <nlohmann/json.hpp>
-#include <unistd.h>
+#include <string>
-#endif
+#if defined(_WIN32)
-#include "Discord/discord_info.h"
+#include <windows.h>
-#include "Network/network.hpp"
+#elif defined(__linux__)
-#include "Security/Init.h"
+#include <unistd.h>
-#include <filesystem>
+#endif
-#include "Startup.h"
+#include "Http.h"
-#include "Logger.h"
+#include "Logger.h"
-#include <fstream>
+#include "Network/network.hpp"
-#include <thread>
+#include "Security/Init.h"
-#include "Http.h"
+#include "Startup.h"
-#include "Json.h"
+#include "hashpp.h"
-
+#include <filesystem>
-extern int TraceBack;
+#include <fstream>
-bool Dev = false;
+#include <thread>
-namespace fs = std::filesystem;
+
-
+extern int TraceBack;
-#if defined(_WIN32)
+bool Dev = false;
-std::string GetEN(){
+int ProxyPort = 0;
-    return "BeamMP-Launcher.exe";
+
-}
+namespace fs = std::filesystem;
-#elif defined(__linux__)
+
-std::string GetEN(){
+struct Version {
-    return "BeamMP-Launcher";
+    uint8_t major;
-}
+    uint8_t minor;
-#endif
+    uint8_t patch;
-
+    Version(uint8_t major, uint8_t minor, uint8_t patch);
-std::string GetVer(){
+    Version(const std::array<uint8_t, 3>& v);
-    return "2.0";
+};
-}
+
-std::string GetPatch(){
+std::array<uint8_t, 3> VersionStrToInts(const std::string& str) {
-    return ".82";
+    std::array<uint8_t, 3> Version;
-}
+    std::stringstream ss(str);
-
+    for (uint8_t& i : Version) {
-std::string GetEP(char*P){
+        std::string Part;
-    static std::string Ret = [&](){
+        std::getline(ss, Part, '.');
-        std::string path(P);
+        std::from_chars(&*Part.begin(), &*Part.begin() + Part.size(), i);
-        return path.substr(0, path.find_last_of("\\/") + 1);
+    }
-    } ();
+    return Version;
-    return Ret;
+}
-}
+
-#if defined(_WIN32)
+bool IsOutdated(const Version& Current, const Version& Newest) {
-void ReLaunch(int argc,char*args[]){
+    if (Newest.major > Current.major) {
-    std::string Arg;
+        return true;
-    for(int c = 2; c <= argc; c++){
+    } else if (Newest.major == Current.major && Newest.minor > Current.minor) {
-        Arg += " ";
+        return true;
-        Arg += args[c-1];
+    } else if (Newest.major == Current.major && Newest.minor == Current.minor && Newest.patch > Current.patch) {
-    }
+        return true;
-    system("cls");
+    } else {
-    ShellExecute(nullptr,"runas",(GetEP() + GetEN()).c_str(),Arg.c_str(),nullptr,SW_SHOWNORMAL);
+        return false;
-    ShowWindow(GetConsoleWindow(),0);
+    }
-    std::this_thread::sleep_for(std::chrono::seconds(1));
+}
-    exit(1);
+
-}
+Version::Version(uint8_t major, uint8_t minor, uint8_t patch)
-void URelaunch(int argc,char* args[]){
+    : major(major)
-    std::string Arg;
+    , minor(minor)
-    for(int c = 2; c <= argc; c++){
+    , patch(patch) { }
-        Arg += " ";
+
-        Arg += args[c-1];
+Version::Version(const std::array<uint8_t, 3>& v)
-    }
+    : Version(v[0], v[1], v[2]) {
-    ShellExecute(nullptr,"open",(GetEP() + GetEN()).c_str(),Arg.c_str(),nullptr,SW_SHOWNORMAL);
+}
-    ShowWindow(GetConsoleWindow(),0);
+
-    std::this_thread::sleep_for(std::chrono::seconds(1));
+std::string GetEN() {
-    exit(1);
+#if defined(_WIN32)
-}
+    return "BeamMP-Launcher.exe";
-#elif defined(__linux__)
+#elif defined(__linux__)
-void ReLaunch(int argc,char*args[]){
+    return "BeamMP-Launcher";
-    std::string Arg;
+#endif
-    for(int c = 2; c <= argc; c++){
+}
-        Arg += " ";
+
-        Arg += args[c-1];
+std::string GetVer() {
-    }
+    return "2.1";
-    system("clear");
+}
-    execl((GetEP() + GetEN()).c_str(), Arg.c_str(), NULL);
+std::string GetPatch() {
-    std::this_thread::sleep_for(std::chrono::seconds(1));
+    return ".0";
-    exit(1);
+}
-}
+
-void URelaunch(int argc,char* args[]){
+std::string GetEP(char* P) {
-    std::string Arg;
+    static std::string Ret = [&]() {
-    for(int c = 2; c <= argc; c++){
+        std::string path(P);
-        Arg += " ";
+        return path.substr(0, path.find_last_of("\\/") + 1);
-        Arg += args[c-1];
+    }();
-    }
+    return Ret;
-    execl((GetEP() + GetEN()).c_str(), Arg.c_str(), NULL);
+}
-    std::this_thread::sleep_for(std::chrono::seconds(1));
+#if defined(_WIN32)
-    exit(1);
+void ReLaunch(int argc, char* args[]) {
-}
+    std::string Arg;
-#endif
+    for (int c = 2; c <= argc; c++) {
-
+        Arg += " ";
-void CheckName(int argc,char* args[]){
+        Arg += args[c - 1];
-    #if defined(_WIN32)
+    }
-    std::string DN = GetEN(),CDir = args[0],FN = CDir.substr(CDir.find_last_of('\\')+1);
+    system("cls");
-    #elif defined(__linux__)
+    ShellExecute(nullptr, "runas", (GetEP() + GetEN()).c_str(), Arg.c_str(), nullptr, SW_SHOWNORMAL);
-    std::string DN = GetEN(),CDir = args[0],FN = CDir.substr(CDir.find_last_of('/')+1);
+    ShowWindow(GetConsoleWindow(), 0);
-    #endif
+    std::this_thread::sleep_for(std::chrono::seconds(1));
-    if(FN != DN){
+    exit(1);
-        if(fs::exists(DN))remove(DN.c_str());
+}
-        if(fs::exists(DN))ReLaunch(argc,args);
+void URelaunch(int argc, char* args[]) {
-        std::rename(FN.c_str(), DN.c_str());
+    std::string Arg;
-        URelaunch(argc,args);
+    for (int c = 2; c <= argc; c++) {
-    }
+        Arg += " ";
-}
+        Arg += args[c - 1];
-
+    }
-void CheckForUpdates(int argc,char*args[],const std::string& CV){
+    ShellExecute(nullptr, "open", (GetEP() + GetEN()).c_str(), Arg.c_str(), nullptr, SW_SHOWNORMAL);
-    std::string link;
+    ShowWindow(GetConsoleWindow(), 0);
-    std::string HTTP = HTTP::Get("https://beammp.com/builds/launcher?version=true");
+    std::this_thread::sleep_for(std::chrono::seconds(1));
-    bool fallback = false;
+    exit(1);
-    if(HTTP.find_first_of("0123456789") == std::string::npos){
+}
-        HTTP = HTTP::Get("https://backup1.beammp.com/builds/launcher?version=true");
+#elif defined(__linux__)
-        fallback = true;
+void ReLaunch(int argc, char* args[]) {
-        if(HTTP.find_first_of("0123456789") == std::string::npos) {
+    std::string Arg;
-            fatal("Primary Servers Offline! sorry for the inconvenience!");
+    for (int c = 2; c <= argc; c++) {
-        }
+        Arg += " ";
-    }
+        Arg += args[c - 1];
-    if(fallback){
+    }
-        link = "https://backup1.beammp.com/builds/launcher?download=true";
+    system("clear");
-    }else link = "https://beammp.com/builds/launcher?download=true";
+    execl((GetEP() + GetEN()).c_str(), Arg.c_str(), NULL);
-
+    std::this_thread::sleep_for(std::chrono::seconds(1));
-    std::string EP(GetEP() + GetEN()), Back(GetEP() + "BeamMP-Launcher.back");
+    exit(1);
-
+}
-    if(fs::exists(Back))remove(Back.c_str());
+void URelaunch(int argc, char* args[]) {
-
+    std::string Arg;
-    if(HTTP > CV){
+    for (int c = 2; c <= argc; c++) {
-        #if defined(_WIN32)
+        Arg += " ";
-        system("cls");
+        Arg += args[c - 1];
-        #elif defined(__linux__)
+    }
-        system("clear");
+    execl((GetEP() + GetEN()).c_str(), Arg.c_str(), NULL);
-        #endif
+    std::this_thread::sleep_for(std::chrono::seconds(1));
-        info("Update found!");
+    exit(1);
-        info("Updating...");
+}
-        if(std::rename(EP.c_str(), Back.c_str()))error("failed creating a backup!");
+#endif
-
+
-        if(!HTTP::Download(link, EP)){
+void CheckName(int argc, char* args[]) {
-            error("Launcher Update failed! trying again...");
+#if defined(_WIN32)
-            std::this_thread::sleep_for(std::chrono::seconds(2));
+    std::string DN = GetEN(), CDir = args[0], FN = CDir.substr(CDir.find_last_of('\\') + 1);
-
+#elif defined(__linux__)
-            if(!HTTP::Download(link, EP)){
+    std::string DN = GetEN(), CDir = args[0], FN = CDir.substr(CDir.find_last_of('/') + 1);
-                error("Launcher Update failed!");
+#endif
-                std::this_thread::sleep_for(std::chrono::seconds(5));
+    if (FN != DN) {
-                ReLaunch(argc,args);
+        if (fs::exists(DN))
-            }
+            remove(DN.c_str());
-        }
+        if (fs::exists(DN))
-        URelaunch(argc,args);
+            ReLaunch(argc, args);
-    }else info("Launcher version is up to date");
+        std::rename(FN.c_str(), DN.c_str());
-    TraceBack++;
+        URelaunch(argc, args);
-}
+    }
-
+}
-void CustomPort(int argc, char* argv[]){
+
-    if(argc > 1){
+void CheckForUpdates(int argc, char* args[], const std::string& CV) {
-        std::string Port = argv[1];
+    std::string LatestHash = HTTP::Get("https://backend.beammp.com/sha/launcher?branch=" + Branch + "&pk=" + PublicKey);
-        if(Port.find_first_not_of("0123456789") == std::string::npos){
+    std::string LatestVersion = HTTP::Get(
-            if(std::stoi(Port) > 1000){
+        "https://backend.beammp.com/version/launcher?branch=" + Branch + "&pk=" + PublicKey);
-                DEFAULT_PORT = std::stoi(Port);
+
-                warn("Running on custom port : " + std::to_string(DEFAULT_PORT));
+    transform(LatestHash.begin(), LatestHash.end(), LatestHash.begin(), ::tolower);
-            }
+    std::string EP(GetEP() + GetEN()), Back(GetEP() + "BeamMP-Launcher.back");
-        }
+
-        if(argc > 2)Dev = true;
+    std::string FileHash = hashpp::get::getFileHash(hashpp::ALGORITHMS::SHA2_256, EP);
-    }
+#if defined(_WIN32)
-}
+#elif defined(__linux__)
-
+    system("clear");
-#ifdef _WIN32
+#endif
-void LinuxPatch(){
+
-    HKEY hKey = nullptr;
+    if (FileHash != LatestHash && IsOutdated(Version(VersionStrToInts(GetVer() + GetPatch())), Version(VersionStrToInts(LatestVersion)))) {
-    LONG result = RegOpenKeyEx(HKEY_CURRENT_USER, R"(Software\Wine)", 0, KEY_READ, &hKey);
+        info("Launcher update found!");
-    if (result != ERROR_SUCCESS || getenv("USER") == nullptr)return;
+#if defined(__linux__)
-    RegCloseKey(hKey);
+        error("Auto update is NOT implemented for the Linux version. Please update manually ASAP as updates contain security patches.");
-    info("Wine/Proton Detected! If you are on windows delete HKEY_CURRENT_USER\\Software\\Wine in regedit");
+#else
-    info("Applying patches...");
+        fs::remove(Back);
-
+        fs::rename(EP, Back);
-    result = RegCreateKey(HKEY_CURRENT_USER, R"(Software\Valve\Steam\Apps\284160)", &hKey);
+        info("Downloading Launcher update " + LatestHash);
-
+        HTTP::Download(
-    if (result != ERROR_SUCCESS){
+            "https://backend.beammp.com/builds/launcher?download=true"
-        fatal(R"(failed to create HKEY_CURRENT_USER\Software\Valve\Steam\Apps\284160)");
+            "&pk="
-        return;
+                + PublicKey + "&branch=" + Branch,
-    }
+            EP);
-
+        URelaunch(argc, args);
-    result = RegSetValueEx(hKey, "Name", 0, REG_SZ, (BYTE*)"BeamNG.drive", 12);
+#endif
-
+    } else
-    if (result != ERROR_SUCCESS){
+        info("Launcher version is up to date");
-        fatal(R"(failed to create the value "Name" under HKEY_CURRENT_USER\Software\Valve\Steam\Apps\284160)");
+    TraceBack++;
-        return;
+}
-    }
+
-    RegCloseKey(hKey);
+void CustomPort(int argc, char* argv[]) {
-
+    if (argc > 1) {
-    std::string Path = R"(Z:\home\)" + std::string(getenv("USER")) + R"(\.steam\steam\Steam.exe)";
+        std::string Port = argv[1];
-
+        if (Port.find_first_not_of("0123456789") == std::string::npos) {
-    if(!fs::exists(Path)) {
+            if (std::stoi(Port) > 1000) {
-        std::ofstream ofs(Path);
+                DEFAULT_PORT = std::stoi(Port);
-        if (!ofs.is_open()) {
+                warn("Running on custom port : " + std::to_string(DEFAULT_PORT));
-            fatal("Failed to create file \"" + Path + "\"");
+            }
-            return;
+        }
-        } else ofs.close();
+        if (argc > 2)
-    }
+            Dev = true;
-
+    }
-    result = RegOpenKeyEx(HKEY_CURRENT_USER, R"(Software\Valve\Steam)", 0, KEY_ALL_ACCESS, &hKey);
+    for (int i = 1; i < argc; ++i) {
-    if (result != ERROR_SUCCESS){
+        if (std::string_view(argv[i]) == "--dev") {
-        fatal(R"(failed to open HKEY_CURRENT_USER\Software\Valve\Steam)");
+            Dev = true;
-        return;
+        } else if (std::string_view(argv[i]) == "--no-dev") {
-    }
+            Dev = false;
-
+        }
-    result = RegSetValueEx(hKey, "SteamExe", 0, REG_SZ, (BYTE*)Path.c_str(), Path.size());
+    }
-
+}
-    if (result != ERROR_SUCCESS){
+
-        fatal(R"(failed to create the value "Name" under HKEY_CURRENT_USER\Software\Valve\Steam\Apps\284160)");
+#ifdef _WIN32
-        return;
+void LinuxPatch() {
-    }
+    HKEY hKey = nullptr;
-
+    LONG result = RegOpenKeyEx(HKEY_CURRENT_USER, R"(Software\Wine)", 0, KEY_READ, &hKey);
-    RegCloseKey(hKey);
+    if (result != ERROR_SUCCESS || getenv("USER") == nullptr)
-
+        return;
-    info("Patched!");
+    RegCloseKey(hKey);
-}
+    info("Wine/Proton Detected! If you are on windows delete HKEY_CURRENT_USER\\Software\\Wine in regedit");
-#endif
+    info("Applying patches...");
-
+
-#if defined(_WIN32)
+    result = RegCreateKey(HKEY_CURRENT_USER, R"(Software\Valve\Steam\Apps\284160)", &hKey);
-void InitLauncher(int argc, char* argv[]) {
+
-    system("cls");
+    if (result != ERROR_SUCCESS) {
-    SetConsoleTitleA(("BeamMP Launcher v" + std::string(GetVer()) + GetPatch()).c_str());
+        fatal(R"(failed to create HKEY_CURRENT_USER\Software\Valve\Steam\Apps\284160)");
-    InitLog();
+        return;
-    CheckName(argc, argv);
+    }
-    LinuxPatch();
+
-    CheckLocalKey();
+    result = RegSetValueEx(hKey, "Name", 0, REG_SZ, (BYTE*)"BeamNG.drive", 12);
-    ConfigInit();
+
-    CustomPort(argc, argv);
+    if (result != ERROR_SUCCESS) {
-    Discord_Main();
+        fatal(R"(failed to create the value "Name" under HKEY_CURRENT_USER\Software\Valve\Steam\Apps\284160)");
-    CheckForUpdates(argc, argv, std::string(GetVer()) + GetPatch());
+        return;
-}
+    }
-#elif defined(__linux__)
+    RegCloseKey(hKey);
-void InitLauncher(int argc, char* argv[]) {
+
-    system("clear");
+    info("Patched!");
-    InitLog();
+}
-    CheckName(argc, argv);
+#endif
-    CheckLocalKey();
+
-    ConfigInit();
+#if defined(_WIN32)
-    CustomPort(argc, argv);
+void InitLauncher(int argc, char* argv[]) {
-    CheckForUpdates(argc, argv, std::string(GetVer()) + GetPatch());
+    system("cls");
-}
+    SetConsoleTitleA(("BeamMP Launcher v" + std::string(GetVer()) + GetPatch()).c_str());
-#endif
+    InitLog();
-
+    CheckName(argc, argv);
-size_t DirCount(const std::filesystem::path& path){
+    LinuxPatch();
-    return (size_t)std::distance(std::filesystem::directory_iterator{path}, std::filesystem::directory_iterator{});
+    CheckLocalKey();
-}
+    ConfigInit();
-
+    CustomPort(argc, argv);
-void CheckMP(const std::string& Path) {
+    CheckForUpdates(argc, argv, std::string(GetVer()) + GetPatch());
-    if (!fs::exists(Path))return;
+}
-    size_t c = DirCount(fs::path(Path));
+#elif defined(__linux__)
-    try {
+void InitLauncher(int argc, char* argv[]) {
-        for (auto& p : fs::directory_iterator(Path)){
+    system("clear");
-            if(p.exists() && !p.is_directory()){
+    InitLog();
-                std::string Name = p.path().filename().u8string();
+    CheckName(argc, argv);
-                for(char&Ch : Name)Ch = char(tolower(Ch));
+    CheckLocalKey();
-                if(Name != "beammp.zip")fs::remove(p.path());
+    ConfigInit();
-            }
+    CustomPort(argc, argv);
-        }
+    bool update = true;
-    } catch (...) {
+    for (int i = 1; i < argc; ++i) {
-        fatal("We were unable to clean the multiplayer mods folder! Is the game still running or do you have something open in that folder?");
+        if (std::string_view(argv[i]) == "--no-update") {
-    }
+            update = false;
-
+        }
-}
+    }
-
+    if (update) {
-void EnableMP(){
+        CheckForUpdates(argc, argv, std::string(GetVer()) + GetPatch());
-    std::string File(GetGamePath() + "mods/db.json");
+    }
-    if(!fs::exists(File))return;
+}
-    auto Size = fs::file_size(File);
+#endif
-    if(Size < 2)return;
+
-    std::ifstream db(File);
+size_t DirCount(const std::filesystem::path& path) {
-    if(db.is_open()) {
+    return (size_t)std::distance(std::filesystem::directory_iterator { path }, std::filesystem::directory_iterator {});
-        std::string Data(Size, 0);
+}
-        db.read(&Data[0], Size);
+
-        db.close();
+void CheckMP(const std::string& Path) {
-        json::Document d;
+    if (!fs::exists(Path))
-        d.Parse(Data.c_str());
+        return;
-        if(Data.at(0) != '{' || d.HasParseError()){
+    size_t c = DirCount(fs::path(Path));
-            //error("Failed to parse " + File); //TODO illegal formatting
+    try {
-            return;
+        for (auto& p : fs::directory_iterator(Path)) {
-        }
+            if (p.exists() && !p.is_directory()) {
-        if(d.HasMember("mods") && !d["mods"].IsNull() && d["mods"].HasMember("multiplayerbeammp") && !d["mods"]["multiplayerbeammp"].IsNull()){
+                std::string Name = p.path().filename().string();
-            d["mods"]["multiplayerbeammp"]["active"] = true;
+                for (char& Ch : Name)
-            rapidjson::StringBuffer buffer;
+                    Ch = char(tolower(Ch));
-            rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+                if (Name != "beammp.zip")
-            d.Accept(writer);
+                    fs::remove(p.path());
-            std::ofstream ofs(File);
+            }
-            if(ofs.is_open()){
+        }
-                ofs << buffer.GetString();
+    } catch (...) {
-                ofs.close();
+        fatal("We were unable to clean the multiplayer mods folder! Is the game still running or do you have something open in that folder?");
-            }else{
+    }
-                error("Failed to write " + File);
+}
-            }
+
-        }
+void EnableMP() {
-    }
+    std::string File(GetGamePath() + "mods/db.json");
-}
+    if (!fs::exists(File))
-
+        return;
-void PreGame(const std::string& GamePath){
+    auto Size = fs::file_size(File);
-    std::string GameVer = CheckVer(GamePath);
+    if (Size < 2)
-    info("Game Version : " + GameVer);
+        return;
-    
+    std::ifstream db(File);
-    CheckMP(GetGamePath() + "mods/multiplayer");
+    if (db.is_open()) {
-
+        std::string Data(Size, 0);
-    if(!Dev) {
+        db.read(&Data[0], Size);
-        info("Downloading mod please wait...");
+        db.close();
-        try {
+        nlohmann::json d = nlohmann::json::parse(Data, nullptr, false);
-            if (!fs::exists(GetGamePath() + "mods/multiplayer")) {
+        if (Data.at(0) != '{' || d.is_discarded()) {
-                fs::create_directories(GetGamePath() + "mods/multiplayer");
+            // error("Failed to parse " + File); //TODO illegal formatting
-            }
+            return;
-            EnableMP();
+        }
-        }catch(std::exception&e){
+        if (d.contains("mods") && d["mods"].contains("multiplayerbeammp")) {
-            fatal(e.what());
+            d["mods"]["multiplayerbeammp"]["active"] = true;
-        }
+            std::ofstream ofs(File);
-        #if defined(_WIN32)
+            if (ofs.is_open()) {
-        std::string ZipPath(GetGamePath() + R"(mods\multiplayer\BeamMP.zip)");
+                ofs << d.dump();
-        #elif defined(__linux__)
+                ofs.close();
-        // Linux version of the game cant handle mods with uppercase names
+            } else {
-        std::string ZipPath(GetGamePath() + R"(mods/multiplayer/beammp.zip)");
+                error("Failed to write " + File);
-        #endif
+            }
-
+        }
-        HTTP::Download("https://backend.beammp.com/builds/client?download=true"
+    }
-                 "&pk=" + PublicKey + "&branch=" + Branch, ZipPath);
+}
-
+
-        std::string Target(GetGamePath() + "mods/unpacked/beammp");
+void PreGame(const std::string& GamePath) {
-
+    std::string GameVer = CheckVer(GamePath);
-        if(fs::is_directory(Target)) {
+    info("Game Version : " + GameVer);
-            fs::remove_all(Target);
+
-        }
+    CheckMP(GetGamePath() + "mods/multiplayer");
-
+
-        //HTTP::Download("beammp.com/builds/client", GetGamePath() + R"(mods\multiplayer\BeamMP.zip)");
+    info("Game user path: '" + GetGamePath() + "'");
-    }
+
-
+    if (!Dev) {
-}
+        std::string LatestHash = HTTP::Get("https://backend.beammp.com/sha/mod?branch=" + Branch + "&pk=" + PublicKey);
+        transform(LatestHash.begin(), LatestHash.end(), LatestHash.begin(), ::tolower);
+        LatestHash.erase(std::remove_if(LatestHash.begin(), LatestHash.end(),
+                             [](auto const& c) -> bool { return !std::isalnum(c); }),
+            LatestHash.end());
+
+        try {
+            if (!fs::exists(GetGamePath() + "mods/multiplayer")) {
+                fs::create_directories(GetGamePath() + "mods/multiplayer");
+            }
+            EnableMP();
+        } catch (std::exception& e) {
+            fatal(e.what());
+        }
+#if defined(_WIN32)
+        std::string ZipPath(GetGamePath() + R"(mods\multiplayer\BeamMP.zip)");
+#elif defined(__linux__)
+        // Linux version of the game cant handle mods with uppercase names
+        std::string ZipPath(GetGamePath() + R"(mods/multiplayer/beammp.zip)");
+#endif
+
+        std::string FileHash = hashpp::get::getFileHash(hashpp::ALGORITHMS::SHA2_256, ZipPath);
+
+        if (FileHash != LatestHash) {
+            info("Downloading BeamMP Update " + LatestHash);
+            HTTP::Download("https://backend.beammp.com/builds/client?download=true"
+                           "&pk="
+                    + PublicKey + "&branch=" + Branch,
+                ZipPath);
+        }
+
+        std::string Target(GetGamePath() + "mods/unpacked/beammp");
+
+        if (fs::is_directory(Target)) {
+            fs::remove_all(Target);
+        }
+    }
+}
+
+void set_headers(httplib::Response& res) {
+    res.set_header("Access-Control-Allow-Origin", "*");
+    res.set_header("Access-Control-Request-Method", "POST, OPTIONS, GET");
+    res.set_header("Access-Control-Request-Headers", "X-API-Version");
+}
+
+void StartProxy() {
+    std::thread proxy([&]() {
+        httplib::Server HTTPProxy;
+        httplib::Headers headers = {
+            { "User-Agent", "BeamMP-Launcher/" + GetVer() + GetPatch() },
+            { "Accept", "*/*" }
+        };
+        std::string pattern = "/:any1";
+        for (int i = 2; i <= 4; i++) {
+            HTTPProxy.Get(pattern, [&](const httplib::Request& req, httplib::Response& res) {
+                httplib::Client cli("https://backend.beammp.com");
+                set_headers(res);
+                if (req.has_header("X-BMP-Authentication")) {
+                    headers.emplace("X-BMP-Authentication", PrivateKey);
+                }
+                if (req.has_header("X-API-Version")) {
+                    headers.emplace("X-API-Version", req.get_header_value("X-API-Version"));
+                }
+                if (auto cli_res = cli.Get(req.path, headers); cli_res) {
+                    res.set_content(cli_res->body, cli_res->get_header_value("Content-Type"));
+                } else {
+                    res.set_content(to_string(cli_res.error()), "text/plain");
+                }
+            });
+
+            HTTPProxy.Post(pattern, [&](const httplib::Request& req, httplib::Response& res) {
+                httplib::Client cli("https://backend.beammp.com");
+                set_headers(res);
+                if (req.has_header("X-BMP-Authentication")) {
+                    headers.emplace("X-BMP-Authentication", PrivateKey);
+                }
+                if (req.has_header("X-API-Version")) {
+                    headers.emplace("X-API-Version", req.get_header_value("X-API-Version"));
+                }
+                if (auto cli_res = cli.Post(req.path, headers, req.body,
+                        req.get_header_value("Content-Type"));
+                    cli_res) {
+                    res.set_content(cli_res->body, cli_res->get_header_value("Content-Type"));
+                } else {
+                    res.set_content(to_string(cli_res.error()), "text/plain");
+                }
+            });
+            pattern += "/:any" + std::to_string(i);
+        }
+        ProxyPort = HTTPProxy.bind_to_any_port("0.0.0.0");
+        HTTPProxy.listen_after_bind();
+    });
+    proxy.detach();
+}

src/main.cpp

@@ -5,39 +5,41 @@
 ///
 /// Created by Anonymous275 on 7/16/2020
 ///
+#include "Http.h"
+#include "Logger.h"
 #include "Network/network.hpp"
 #include "Security/Init.h"
 #include "Startup.h"
 #include <iostream>
-#include "Logger.h"
 #include <thread>
-#include "Http.h"
 
-[[noreturn]] void flush(){
+[[noreturn]] void flush() {
-    while(true){
+    while (true) {
         std::cout.flush();
         std::this_thread::sleep_for(std::chrono::milliseconds(100));
     }
 }
 
 int main(int argc, char* argv[]) {
-    #ifdef DEBUG
+#ifdef DEBUG
-        std::thread th(flush);
+    std::thread th(flush);
-        th.detach();
+    th.detach();
-    #endif
+#endif
+
     GetEP(argv[0]);
 
-    InitLauncher(argc,argv);
+    InitLauncher(argc, argv);
 
     try {
         LegitimacyCheck();
-    }catch (std::exception& e){
+    } catch (std::exception& e) {
         fatal("Main 1 : " + std::string(e.what()));
     }
 
+    StartProxy();
     PreGame(GetGameDir());
     InitGame(GetGameDir());
     CoreNetwork();
 
-    ///TODO: make sure to use argv[0] for everything that should be in the same dir (mod down ect...)
+    /// TODO: make sure to use argv[0] for everything that should be in the same dir (mod down ect...)
 }

vcpkg.json

@@ -0,0 +1,10 @@
+{
+  "dependencies": [
+    "cpp-httplib",
+    "nlohmann-json",
+    "zlib",
+    "openssl",
+    "asio",
+    "fmt"
+  ]
+}