Added IPv6 support

Send id from auth to game

.clang-format

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

.github/workflows/cmake-linux.yml

@@ -14,13 +14,21 @@ jobs:
         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
 
       - 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

@@ -5,3 +5,10 @@ cmake-build-release
 /*.sh
 /*.obj
 /*.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")
 
+add_compile_definitions(CPPHTTPLIB_OPENSSL_SUPPORT)
+
 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)
 
 add_executable(${PROJECT_NAME} ${source_files})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "BeamMP-Launcher")
@@ -19,12 +24,8 @@ 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)
-    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)
@@ -33,6 +34,6 @@ elseif (LINUX)
 else(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)
 endif(WIN32)
 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/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 std::string Post(const std::string& IP, const std::string& Fields);
     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,24 +6,22 @@
 /// Created by Anonymous275 on 7/18/2020
 ///
 
-
 #pragma once
 #include <string>
 
 #ifdef __linux__
-#include <cstdint>
 #include "linuxfixes.h"
 #include <bits/types/siginfo_t.h>
+#include <cstdint>
 #include <sys/ucontext.h>
 #endif
 
-
-
 void NetReset();
 extern bool Dev;
 extern int ping;
 
 [[noreturn]] void CoreNetwork();
+extern int ProxyPort;
 extern int ClientID;
 extern int LastPort;
 extern bool ModLoaded;
@@ -37,20 +35,20 @@ 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 UUl(const std::string& R);
 void UDPSend(std::string Data);
 bool CheckBytes(int32_t Bytes);
-void GameSend(std::string Data);
+void GameSend(std::string_view Data);
 void SendLarge(std::string Data);
 std::string TCPRcv(uint64_t Sock);
 void SyncResources(uint64_t TCPSock);
 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 TCPClientMain(const std::string& IP, int Port);
 void UDPClientMain(const std::string& IP, int Port);
 void TCPGameServer(const std::string& IP, int Port);
-

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 GetGamePath();
 std::string GetVer();
 std::string GetEN();
+void StartProxy();
 void ConfigInit();
 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);

src/Compressor.cpp

@@ -6,52 +6,57 @@
 /// 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 = compress(
-    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];
+    if (res != Z_OK) {
-    defstream.avail_out = Biggest;
+        error("zlib compress() failed: " + std::to_string(res));
-    defstream.next_out = reinterpret_cast<Bytef *>(C);
+        throw std::runtime_error("zlib compress() failed");
-    deflateInit(&defstream, Z_BEST_COMPRESSION);
-    deflate(&defstream, Z_SYNC_FLUSH);
-    deflate(&defstream, Z_FINISH);
-    deflateEnd(&defstream);
-    int TO = defstream.total_out;
-    std::string Ret(TO,0);
-    memcpy(&Ret[0],C,TO);
-    delete [] C;
-    return Ret;
     }
-std::string DeComp(std::string Compressed){
+    debug("zlib compressed " + std::to_string(input.size()) + " B to " + std::to_string(output_size) + " B");
-    char*C = new char[Biggest];
+    output.resize(output_size);
-    memset(C, 0, Biggest);
+    return output;
-    z_stream infstream;
+}
-    infstream.zalloc = Z_NULL;
+
-    infstream.zfree = Z_NULL;
+std::vector<char> DeComp(std::span<const char> input) {
-    infstream.opaque = Z_NULL;
+    std::vector<char> output_buffer(std::min<size_t>(input.size() * 5, 15 * 1024 * 1024));
-    infstream.avail_in = Biggest;
+
-    infstream.next_in = (Bytef *)(&Compressed[0]);
+    uLongf output_size = output_buffer.size();
-    infstream.avail_out = Biggest;
+
-    infstream.next_out = (Bytef *)(C);
+    while (true) {
-    inflateInit(&infstream);
+        int res = uncompress(
-    inflate(&infstream, Z_SYNC_FLUSH);
+            reinterpret_cast<Bytef*>(output_buffer.data()),
-    inflate(&infstream, Z_FINISH);
+            &output_size,
-    inflateEnd(&infstream);
+            reinterpret_cast<const Bytef*>(input.data()),
-    int TO = infstream.total_out;
+            static_cast<uLongf>(input.size()));
-    std::string Ret(TO,0);
+        if (res == Z_BUF_ERROR) {
-    memcpy(&Ret[0],C,TO);
+            if (output_buffer.size() > 30 * 1024 * 1024) {
-    delete [] C;
+                throw std::runtime_error("decompressed packet size of 30 MB exceeded");
-    return Ret;
+            }
+            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;
 }

src/Config.cpp

@@ -2,18 +2,18 @@
 /// Created by Anonymous275 on 2/23/2021
 ///
 
-#include "Network/network.hpp"
-#include <filesystem>
 #include "Logger.h"
-#include <fstream>
+#include "Network/network.hpp"
-#include "Json.h"
 #include <cstdint>
+#include <filesystem>
+#include <fstream>
+#include <nlohmann/json.hpp>
 namespace fs = std::filesystem;
 
 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
     // Release 1
@@ -21,9 +21,10 @@ void ParseConfig(const json::Document& d){
     // Dev 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));
     }
 }
 
@@ -35,13 +36,13 @@ void ConfigInit(){
             std::string Buffer(Size, 0);
             cfg.read(&Buffer[0], Size);
             cfg.close();
-            json::Document d;
+            nlohmann::json d = nlohmann::json::parse(Buffer, nullptr, false);
-            d.Parse(Buffer.c_str());
+            if (d.is_discarded()) {
-            if(d.HasParseError()){
+                fatal("Config failed to parse make sure it's valid JSON!");
-                fatal("Config failed to parse make sure it's valid JSON! Code : " + std::to_string(d.GetParseError()));
             }
             ParseConfig(d);
-        }else fatal("Failed to open Launcher.cfg!");
+        } else
+            fatal("Failed to open Launcher.cfg!");
     } else {
         std::ofstream cfg("Launcher.cfg");
         if (cfg.is_open()) {
@@ -56,4 +57,3 @@ void ConfigInit(){
         }
     }
 }
-

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,22 +6,21 @@
 /// Created by Anonymous275 on 7/19/2020
 ///
 
-
 #if defined(_WIN32)
 #include <windows.h>
 #elif defined(__linux__)
 #include "vdf_parser.hpp"
 #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;
@@ -29,7 +28,8 @@ unsigned long GamePID = 0;
 std::string QueryKey(HKEY hKey, int ID);
 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";
@@ -51,6 +51,7 @@ std::string GetGamePath(){
     std::string Ver = CheckVer(GetGameDir());
     Ver = Ver.substr(0, Ver.find('.', Ver.find('.') + 1));
     Path += Ver + "\\";
+    info("Game user path: '" + Path + "'");
     return Path;
 }
 #elif defined(__linux__)
@@ -63,6 +64,7 @@ std::string GetGamePath(){
     std::string Ver = CheckVer(GetGameDir());
     Ver = Ver.substr(0, Ver.find('.', Ver.find('.') + 1));
     Path += Ver + "/";
+    info("Game user path: '" + Path + "'");
     return Path;
 }
 #endif

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() {
@@ -39,7 +39,8 @@ void InitLog(){
     LFS.open(GetEP() + "Launcher.log");
     if (!LFS.is_open()) {
         error("logger file init failed!");
-    }else LFS.close();
+    } else
+        LFS.close();
 }
 void addToLog(const std::string& Line) {
     std::ofstream LFS;
@@ -53,7 +54,8 @@ void info(const std::string& toPrint) {
     addToLog(Print);
 }
 void debug(const std::string& toPrint) {
-    if(!Dev)return;
+    if (!Dev)
+        return;
     std::string Print = getDate() + "[DEBUG] " + toPrint + "\n";
     std::cout << Print;
     addToLog(Print);

src/Network/Core.cpp

@@ -5,27 +5,31 @@
 ///
 /// Created by Anonymous275 on 7/20/2020
 ///
+#include "Http.h"
 #include "Network/network.hpp"
 #include "Security/Init.h"
-
+#include <cstdlib>
-#include "Http.h"
+#include <regex>
 #if defined(_WIN32)
 #include <winsock2.h>
 #include <ws2tcpip.h>
-
 #elif defined(__linux__)
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
 #include <cstring>
 #include <errno.h>
+#include <netdb.h>
+#include <spawn.h>
+#include <sys/socket.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 <nlohmann/json.hpp>
 #include <set>
+#include <thread>
 
 extern int TraceBack;
 std::set<std::string>* ConfList = nullptr;
@@ -33,6 +37,9 @@ bool TCPTerminate = false;
 int DEFAULT_PORT = 4444;
 bool Terminate = false;
 bool LoginAuth = false;
+std::string Username = "";
+std::string UserRole = "";
+int UserID = -1;
 std::string UlStatus;
 std::string MStatus;
 bool ModLoaded;
@@ -41,8 +48,10 @@ int ping = -1;
 void StartSync(const std::string& Data) {
     std::string IP = GetAddr(Data.substr(1, Data.find(':') - 1));
     if (IP.find('.') == -1) {
-        if(IP == "DNS")UlStatus ="UlConnection Failed! (DNS Lookup Failed)";
+        if (IP == "DNS")
-        else UlStatus = "UlConnection Failed! (WSA failed to start)";
+            UlStatus = "UlConnection Failed! (DNS Lookup Failed)";
+        else
+            UlStatus = "UlConnection Failed! (WSA failed to start)";
         ListOfMods = "-";
         Terminate = true;
         return;
@@ -57,9 +66,17 @@ void StartSync(const std::string &Data){
     GS.detach();
     info("Connecting to server");
 }
+
+bool IsAllowedLink(const std::string& Link) {
+    std::regex link_pattern(R"(https:\/\/(?:\w+)?(?:\.)?(?:beammp\.com|discord\.gg))");
+    std::smatch link_match;
+    return std::regex_search(Link, link_match, link_pattern) && link_match.position() == 0;
+}
+
 void Parse(std::string Data, SOCKET CSocket) {
     char Code = Data.at(0), SubCode = 0;
-    if(Data.length() > 1)SubCode = Data.at(1);
+    if (Data.length() > 1)
+        SubCode = Data.at(1);
     switch (Code) {
     case 'A':
         Data = Data.substr(0, 1);
@@ -76,20 +93,56 @@ void Parse(std::string Data,SOCKET CSocket){
         while (ListOfMods.empty() && !Terminate) {
             std::this_thread::sleep_for(std::chrono::seconds(1));
         }
-            if(ListOfMods == "-")Data = "L";
+        if (ListOfMods == "-")
-            else Data = "L"+ListOfMods;
+            Data = "L";
+        else
+            Data = "L" + ListOfMods;
+        break;
+    case 'O': // open default browser with URL
+        if (IsAllowedLink(Data.substr(1))) {
+#if defined(__linux)
+            if (char* browser = getenv("BROWSER"); browser != nullptr && !std::string_view(browser).empty()) {
+                pid_t pid;
+                auto arg = Data.substr(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: " + Data.substr(1));
+            }
+#elif defined(WIN32)
+            ShellExecuteA(nullptr, "open", Data.substr(1).c_str(), nullptr, nullptr, SW_SHOW); /// TODO: Look at when working on linux port
+#endif
+
+            info("Opening Link \"" + Data.substr(1) + "\"");
+        }
+        Data.clear();
+        break;
+    case 'P':
+        Data = Code + std::to_string(ProxyPort);
         break;
     case 'U':
-            if(SubCode == 'l')Data = UlStatus;
+        if (SubCode == 'l')
+            Data = UlStatus;
         if (SubCode == 'p') {
             if (ping > 800) {
                 Data = "Up-2";
-                }else Data = "Up" + std::to_string(ping);
+            } else
+                Data = "Up" + std::to_string(ping);
         }
         if (!SubCode) {
             std::string Ping;
-                if(ping > 800)Ping = "-2";
+            if (ping > 800)
-                else Ping = std::to_string(ping);
+                Ping = "-2";
+            else
+                Ping = std::to_string(ping);
             Data = std::string(UlStatus) + "\n" + "Up" + Ping;
         }
         break;
@@ -103,7 +156,8 @@ void Parse(std::string Data,SOCKET CSocket){
             TCPTerminate = true;
             ping = -1;
         }
-            if(SubCode == 'G')exit(2);
+        if (SubCode == 'G')
+            exit(2);
         Data.clear();
         break;
     case 'R': // will send mod name
@@ -118,7 +172,19 @@ void Parse(std::string Data,SOCKET CSocket){
         break;
     case 'N':
         if (SubCode == 'c') {
-                Data = "N{\"Auth\":"+std::to_string(LoginAuth)+"}";
+            nlohmann::json Auth = {
+                { "Auth", LoginAuth ? 1 : 0 },
+            };
+            if (!Username.empty()) {
+                Auth["username"] = Username;
+            }
+            if (!UserRole.empty()) {
+                Auth["role"] = UserRole;
+            }
+            if (UserID != -1) {
+                Auth["id"] = UserID;
+            }
+            Data = "N" + Auth.dump();
         } else {
             Data = "N" + Login(Data.substr(Data.find(':') + 1));
         }
@@ -142,14 +208,16 @@ void GameHandler(SOCKET Client){
         Rcv = 0;
         do {
             Temp = recv(Client, &Header[Rcv], 1, 0);
-            if(Temp < 1)break;
+            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 (Temp < 1)
+            break;
         if (std::from_chars(Header, &Header[Rcv], Size).ptr[0] != '>') {
             debug("(Core) Invalid lua Header -> " + std::string(Header, Rcv));
             break;
@@ -159,13 +227,14 @@ void GameHandler(SOCKET Client){
 
         do {
             Temp = recv(Client, &Ret[Rcv], Size - Rcv, 0);
-            if(Temp < 1)break;
+            if (Temp < 1)
+                break;
             Rcv += Temp;
         } while (Rcv < Size);
-        if(Temp < 1)break;
+        if (Temp < 1)
+            break;
 
-        std::thread Respond(Parse, Ret, Client);
+        Parse(Ret, Client);
-        Respond.detach();
     } while (Temp > 0);
     if (Temp == 0) {
         debug("(Core) Connection closing");
@@ -194,12 +263,13 @@ void CoreMain() {
 #ifdef _WIN32
     WSADATA wsaData;
     iRes = WSAStartup(514, &wsaData); // 2.2
-    if (iRes)debug("WSAStartup failed with error: " + std::to_string(iRes));
+    if (iRes)
+        debug("WSAStartup failed with error: " + std::to_string(iRes));
 #endif
 
     ZeroMemory(&hints, sizeof(hints));
 
-    hints.ai_family = AF_INET;
+    hints.ai_family = AF_UNSPEC;
     hints.ai_socktype = SOCK_STREAM;
     hints.ai_protocol = IPPROTO_TCP;
     hints.ai_flags = AI_PASSIVE;
@@ -268,7 +338,8 @@ int Handle(EXCEPTION_POINTERS *ep){
 #if not defined(__MINGW32__) and not defined(__linux__)
         } __except (Handle(GetExceptionInformation())) { }
 #elif not defined(__MINGW32__) and defined(__linux__)
-            } catch(...){
+    }
+    catch (...) {
         except("(Core) Code : " + std::string(strerror(errno)));
     }
 #endif

src/Network/DNS.cpp

@@ -7,19 +7,22 @@
 ///
 
 #include <string>
+#include "IPRegex.h"
 
 #if defined(_WIN32)
 #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) {
-    if(IP.find_first_not_of("0123456789.") == -1)return IP;
+    if (!std::regex_match(IP, IP_REGEX)) {
+        return IP;
+    }
     hostent* host;
 #ifdef _WIN32
     WSADATA wsaData;

src/Network/GlobalHandler.cpp

@@ -6,24 +6,25 @@
 /// Created by Anonymous275 on 7/25/2020
 ///
 #include "Network/network.hpp"
+#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 <mutex>
 #include <string>
 #include <thread>
-#include <mutex>
 
 std::chrono::time_point<std::chrono::high_resolution_clock> PingStart, PingEnd;
 bool GConnected = false;
@@ -55,12 +56,12 @@ bool CheckBytes(uint32_t Bytes){
     return true;
 }
 
-void GameSend(std::string Data){
+void GameSend(std::string_view Data) {
     static std::mutex Lock;
     std::scoped_lock Guard(Lock);
-    if(TCPTerminate || !GConnected || CSocket == -1)return;
+    if (TCPTerminate || !GConnected || CSocket == -1)
+        return;
     int32_t Size, Temp, Sent;
-    Data += '\n';
     Size = int32_t(Data.size());
     Sent = 0;
 #ifdef DEBUG
@@ -72,25 +73,40 @@ void GameSend(std::string Data){
         if (Sent > -1) {
             Temp = send(CSocket, &Data[Sent], Size - Sent, 0);
         }
-        if(!CheckBytes(Temp))return;
+        if (!CheckBytes(Temp))
+            return;
         Sent += Temp;
     } while (Sent < Size);
+    // send separately to avoid an allocation for += "\n"
+    Temp = send(CSocket, "\n", 1, 0);
+    if (!CheckBytes(Temp)) {
+        return;
+    }
 }
 void ServerSend(std::string Data, bool Rel) {
-    if(Terminate || Data.empty())return;
+    if (Terminate || Data.empty())
+        return;
     if (Data.find("Zp") != std::string::npos && Data.size() > 500) {
         abort();
     }
     char C = 0;
     bool Ack = false;
     int DLen = int(Data.length());
-    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')
+        Ack = true;
+    if (C == 'N' || C == 'W' || C == 'Y' || C == 'V' || C == 'E' || C == 'C')
+        Rel = true;
+    if (compressBound(Data.size()) > 1024)
+        Rel = true;
     if (Ack || Rel) {
-        if(Ack || DLen > 1000)SendLarge(Data);
+        if (Ack || DLen > 1000)
-        else TCPSend(Data,TCPSock);
+            SendLarge(Data);
-    }else UDPSend(Data);
+        else
+            TCPSend(Data, TCPSock);
+    } else
+        UDPSend(Data);
 
     if (DLen > 1000) {
         debug("(Launcher->Server) Bytes sent: " + std::to_string(Data.length()) + " : "
@@ -125,7 +141,8 @@ void NetReset(){
 }
 
 SOCKET SetupListener() {
-    if(GSocket != -1)return GSocket;
+    if (GSocket != -1)
+        return GSocket;
     struct addrinfo* result = nullptr;
     struct addrinfo hints { };
     int iRes;
@@ -139,7 +156,7 @@ SOCKET SetupListener(){
 #endif
 
     ZeroMemory(&hints, sizeof(hints));
-    hints.ai_family = AF_INET;
+    hints.ai_family = AF_UNSPEC;
     hints.ai_socktype = SOCK_STREAM;
     hints.ai_protocol = IPPROTO_TCP;
     hints.ai_flags = AI_PASSIVE;
@@ -181,15 +198,19 @@ void AutoPing(){
     }
 }
 int ClientID = -1;
-void ParserAsync(const std::string& Data){
+void ParserAsync(std::string_view Data) {
-    if(Data.empty())return;
+    if (Data.empty())
+        return;
     char Code = Data.at(0), SubCode = 0;
-    if(Data.length() > 1)SubCode = Data.at(1);
+    if (Data.length() > 1)
+        SubCode = Data.at(1);
     switch (Code) {
     case 'p':
         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;
+        else
+            ping = int(std::chrono::duration_cast<std::chrono::milliseconds>(PingEnd - PingStart).count());
         return;
     case 'M':
         MStatus = Data;
@@ -200,7 +221,7 @@ void ParserAsync(const std::string& Data){
     }
     GameSend(Data);
 }
-void ServerParser(const std::string& Data){
+void ServerParser(std::string_view Data) {
     ParserAsync(Data);
 }
 void NetMain(const std::string& IP, int Port) {
@@ -248,9 +269,11 @@ void TCPGameServer(const std::string& IP, int Port){
 
             do {
                 Temp = recv(CSocket, &Header[Rcv], 1, 0);
-                if(Temp < 1 || TCPTerminate)break;
+                if (Temp < 1 || TCPTerminate)
+                    break;
             } while (Header[Rcv++] != '>');
-            if(Temp < 1 || TCPTerminate)break;
+            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;
@@ -259,20 +282,25 @@ void TCPGameServer(const std::string& IP, int Port){
             Rcv = 0;
             do {
                 Temp = recv(CSocket, &Ret[Rcv], Size - Rcv, 0);
-                if(Temp < 1)break;
+                if (Temp < 1)
+                    break;
                 Rcv += Temp;
             } while (Rcv < Size && !TCPTerminate);
-            if(Temp < 1 || TCPTerminate)break;
+            if (Temp < 1 || TCPTerminate)
+                break;
 
             ServerSend(Ret, false);
 
         } while (Temp > 0 && !TCPTerminate);
-        if(Temp == 0)debug("(Proxy) Connection closing");
+        if (Temp == 0)
-        else debug("(Proxy) recv failed error : " + std::to_string(WSAGetLastError()));
+            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 != SOCKET_ERROR)
+        KillSocket(CSocket);
     debug("END OF GAME SERVER");
 }

src/Network/Http.cpp

@@ -5,23 +5,57 @@
 ///
 /// Created by Anonymous275 on 7/18/2020
 ///
-#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>
 
-std::string HTTP::Codes_[] =
+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";
- "Success","Unknown","Connection","BindIPAddress",
+    std::filesystem::create_directories(folder);
- "Read","Write","ExceedRedirectCount","Canceled",
+    if (!std::filesystem::exists(folder / "WHAT IS THIS FOLDER.txt")) {
- "SSLConnection","SSLLoadingCerts","SSLServerVerification",
+        std::ofstream ignore { folder / "WHAT IS THIS FOLDER.txt" };
- "UnsupportedMultipartBoundaryChars","Compression"
+        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());
+}
+
 bool HTTP::isDownload = false;
 std::string HTTP::Get(const std::string& IP) {
     static std::mutex Lock;
@@ -35,16 +69,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) {
             Ret = res->body;
-        }else error(res->reason);
+        } else {
-
+            WriteHttpDebug(cli, "GET", IP, res);
+            error("Failed to GET '" + IP + "': " + res->reason + ", ssl verify = " + std::to_string(cli.get_openssl_verify_result()));
+        }
     } 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;
@@ -63,28 +100,32 @@ std::string HTTP::Post(const std::string& IP, const std::string& Fields) {
     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 {
-            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 {
         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 {
-            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) {
@@ -96,8 +137,10 @@ 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);
     }
@@ -112,7 +155,8 @@ 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()) {

src/Network/Resources.cpp

@@ -11,26 +11,26 @@
 #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 <iostream>
 #include <string>
 #include <thread>
-#include <atomic>
 #include <vector>
-#include <future>
-#include <cmath>
 
 namespace fs = std::filesystem;
 std::string ListOfMods;
@@ -40,10 +40,12 @@ std::vector<std::string> Split(const std::string& String,const std::string& deli
     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;
 }
 
@@ -64,7 +66,6 @@ void WaitForConfirm(){
     ModLoaded = false;
 }
 
-
 void Abord() {
     Terminate = true;
     TCPTerminate = true;
@@ -82,7 +83,8 @@ std::string Auth(SOCKET Sock){
     }
 
     TCPSend(PublicKey, Sock);
-    if(Terminate)return "";
+    if (Terminate)
+        return "";
 
     Res = TCPRcv(Sock);
     if (Res.empty() || Res[0] != 'P') {
@@ -99,7 +101,8 @@ std::string Auth(SOCKET Sock){
         return "";
     }
     TCPSend("SR", Sock);
-    if(Terminate)return "";
+    if (Terminate)
+        return "";
 
     Res = TCPRcv(Sock);
 
@@ -119,8 +122,10 @@ std::string Auth(SOCKET Sock){
 }
 
 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) {
@@ -142,7 +147,8 @@ char* TCPRcvRaw(SOCKET Sock,uint64_t& GRcv, uint64_t Size){
     uint64_t Rcv = 0;
     do {
         int Len = int(Size - Rcv);
-        if(Len > 1000000)Len = 1000000;
+        if (Len > 1000000)
+            Len = 1000000;
         int32_t Temp = recv(Sock, &File[Rcv], Len, MSG_WAITALL);
         if (Temp < 1) {
             info(std::to_string(Temp));
@@ -163,16 +169,16 @@ void MultiKill(SOCKET Sock,SOCKET Sock1){
     Terminate = true;
 }
 SOCKET InitDSock() {
-    SOCKET DSock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    SOCKET DSock = socket(AF_UNSPEC, SOCK_STREAM, IPPROTO_TCP);
     SOCKADDR_IN ServerAddr;
     if (DSock < 1) {
         KillSocket(DSock);
         Terminate = true;
         return 0;
     }
-    ServerAddr.sin_family = AF_INET;
+    ServerAddr.sin_family = AF_UNSPEC;
     ServerAddr.sin_port = htons(LastPort);
-    inet_pton(AF_INET, LastIP.c_str(), &ServerAddr.sin_addr);
+    inet_pton(AF_UNSPEC, LastIP.c_str(), &ServerAddr.sin_addr);
     if (connect(DSock, (SOCKADDR*)&ServerAddr, sizeof(ServerAddr)) != 0) {
         KillSocket(DSock);
         Terminate = true;
@@ -213,8 +219,8 @@ std::string MultiDownload(SOCKET MSock,SOCKET DSock, uint64_t Size, const std::s
         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);
@@ -235,7 +241,8 @@ void InvalidResource(const std::string& File){
 
 void SyncResources(SOCKET Sock) {
     std::string Ret = Auth(Sock);
-    if(Ret.empty())return;
+    if (Ret.empty())
+        return;
 
     info("Checking Resources...");
     CheckForDir();
@@ -253,8 +260,10 @@ void SyncResources(SOCKET Sock){
             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) {
         auto pos = FN->find_last_of('/');
@@ -263,19 +272,23 @@ void SyncResources(SOCKET Sock){
             InvalidResource(*FN);
             return;
         }
-        if (pos == std::string::npos)continue;
+        if (pos == std::string::npos)
+            continue;
         Amount++;
     }
-    if(!FNames.empty())info("Syncing...");
+    if (!FNames.empty())
+        info("Syncing...");
     SOCKET DSock = InitDSock();
     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)
+                continue;
             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));
@@ -283,17 +296,17 @@ void SyncResources(SOCKET Sock){
                     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('/'));
-                    // Linux version of the game doesnt support uppercase letters in mod names
 #if defined(__linux__)
-                    for(char &c : FName){
+                    // Linux version of the game doesnt support uppercase letters in mod names
+                    for (char& c : modname) {
                         c = ::tolower(c);
                     }
 #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,7 +314,8 @@ 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('/'));
@@ -319,7 +333,8 @@ void SyncResources(SOCKET Sock){
 
             Data = MultiDownload(Sock, DSock, std::stoull(*FS), Name);
 
-            if(Terminate)break;
+            if (Terminate)
+                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);

src/Network/VehicleData.cpp

@@ -5,54 +5,58 @@
 ///
 /// Created by Anonymous275 on 5/8/2020
 ///
-#include "Zlib/Compressor.h"
 #include "Network/network.hpp"
+#include "Zlib/Compressor.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;
 sockaddr_in* ToServer = nullptr;
 
 void UDPSend(std::string Data) {
-    if(ClientID == -1 || UDPSock == -1)return;
+    if (ClientID == -1 || UDPSock == -1)
+        return;
     if (Data.length() > 400) {
-        std::string CMP(Comp(Data));
+        auto res = Comp(std::span<char>(Data.data(), Data.size()));
-        Data = "ABG:" + CMP;
+        Data = "ABG:" + std::string(res.data(), res.size());
     }
     std::string Packet = char(ClientID + 1) + std::string(":") + Data;
     int sendOk = sendto(UDPSock, Packet.c_str(), int(Packet.size()), 0, (sockaddr*)ToServer, sizeof(*ToServer));
-    if (sendOk == SOCKET_ERROR)error("Error Code : " + std::to_string(WSAGetLastError()));
+    if (sendOk == SOCKET_ERROR)
+        error("Error Code : " + std::to_string(WSAGetLastError()));
 }
 
-
 void SendLarge(std::string Data) {
     if (Data.length() > 400) {
-        std::string CMP(Comp(Data));
+        auto res = Comp(std::span<char>(Data.data(), Data.size()));
-        Data = "ABG:" + CMP;
+        Data = "ABG:" + std::string(res.data(), res.size());
     }
     TCPSend(Data, TCPSock);
 }
 
-void UDPParser(std::string Packet){
+void UDPParser(std::string_view Packet) {
     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);
     }
+}
 void UDPRcv() {
     sockaddr_in FromServer {};
 #if defined(_WIN32)
@@ -61,11 +65,14 @@ void UDPRcv(){
     socklen_t clientLength = sizeof(FromServer);
 #endif
     ZeroMemory(&FromServer, clientLength);
-    std::string Ret(10240,0);
+    static thread_local std::array<char, 10240> Ret {};
-    if(UDPSock == -1)return;
+    if (UDPSock == -1)
-    int32_t Rcv = recvfrom(UDPSock, &Ret[0], 10240, 0, (sockaddr*)&FromServer, &clientLength);
+        return;
-    if (Rcv == SOCKET_ERROR)return;
+    int32_t Rcv = recvfrom(UDPSock, Ret.data(), Ret.size() - 1, 0, (sockaddr*)&FromServer, &clientLength);
-    UDPParser(Ret.substr(0,Rcv));
+    if (Rcv == SOCKET_ERROR)
+        return;
+    Ret[Rcv] = 0;
+    UDPParser(std::string_view(Ret.data(), Rcv));
 }
 void UDPClientMain(const std::string& IP, int Port) {
 #ifdef _WIN32
@@ -78,14 +85,15 @@ void UDPClientMain(const std::string& IP,int Port){
 
     delete ToServer;
     ToServer = new sockaddr_in;
-    ToServer->sin_family = AF_INET;
+    ToServer->sin_family = AF_UNSPEC;
     ToServer->sin_port = htons(Port);
-    inet_pton(AF_INET, IP.c_str(), &ToServer->sin_addr);
+    inet_pton(AF_UNSPEC, IP.c_str(), &ToServer->sin_addr);
-    UDPSock = socket(AF_INET, SOCK_DGRAM, 0);
+    UDPSock = socket(AF_UNSPEC, SOCK_DGRAM, 0);
     GameSend("P" + std::to_string(ClientID));
     TCPSend("H", TCPSock);
     UDPSend("p");
-    while(!Terminate)UDPRcv();
+    while (!Terminate)
+        UDPRcv();
     KillSocket(UDPSock);
     WSACleanup();
 }

src/Network/VehicleEvent.cpp

@@ -6,21 +6,21 @@
 /// Created by Anonymous275 on 5/8/2020
 ///
 
-#include <chrono>
-#include <vector>
 #include "Logger.h"
-#include <iostream>
 #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"
@@ -112,13 +112,16 @@ std::string TCPRcv(SOCKET Sock){
     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(std::span<char>(substr.data(), substr.size()));
+        Ret = std::string(res.data(), res.size());
     }
 
 #ifdef DEBUG
     // 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;
 }
 
@@ -131,7 +134,7 @@ void TCPClientMain(const std::string& IP,int Port){
     WSADATA wsaData;
     WSAStartup(514, &wsaData); // 2.2
 #endif
-    TCPSock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    TCPSock = socket(AF_UNSPEC, SOCK_STREAM, IPPROTO_TCP);
 
     if (TCPSock == -1) {
         printf("Client: socket failed! Error code: %d\n", WSAGetLastError());
@@ -139,9 +142,9 @@ void TCPClientMain(const std::string& IP,int Port){
         return;
     }
 
-    ServerAddr.sin_family = AF_INET;
+    ServerAddr.sin_family = AF_UNSPEC;
     ServerAddr.sin_port = htons(Port);
-    inet_pton(AF_INET, IP.c_str(), &ServerAddr.sin_addr);
+    inet_pton(AF_UNSPEC, IP.c_str(), &ServerAddr.sin_addr);
     RetCode = connect(TCPSock, (SOCKADDR*)&ServerAddr, sizeof(ServerAddr));
     if (RetCode != 0) {
         UlStatus = "UlConnection Failed!";
@@ -168,5 +171,4 @@ void TCPClientMain(const std::string& IP,int Port){
     if (WSACleanup() != 0)
         debug("(TCP) Client: WSACleanup() failed!...");
 #endif
-
 }

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>
@@ -29,8 +29,7 @@ std::string GameDir;
 
 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));
     std::this_thread::sleep_for(std::chrono::seconds(10));
     exit(2);
@@ -122,18 +121,30 @@ std::string QueryKey(HKEY hKey,int ID){
                 std::string key = achValue;
 
                 switch (ID) {
-                    case 1: if(key == "SteamExe"){
+                case 1:
+                    if (key == "SteamExe") {
                         auto p = data.find_last_of("/\\");
                         if (p != std::string::npos) {
                             return data.substr(0, p);
                         }
                     }
                     break;
-                    case 2: if(key == "Name" && data == "BeamNG.drive")return data;break;
+                case 2:
-                    case 3: if(key == "rootpath")return data;break;
+                    if (key == "Name" && data == "BeamNG.drive")
-                    case 4: if(key == "userpath_override")return data;
+                        return data;
-                    case 5: if(key == "Local AppData")return data;
+                    break;
-                    default: 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;
                 }
             }
         }
@@ -158,9 +169,9 @@ void FileList(std::vector<std::string>&a,const std::string& 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());
         }
     }
 }
@@ -179,9 +190,11 @@ bool Find(const std::string& FName,const std::string& Path){
 bool FindHack(const std::string& Path) {
     bool s = true;
     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 == "steam.exe")
+            s = false;
         if (Name.find("greenluma") != -1) {
             error("Found malicious file/folder \"" + Name + "\"");
             return true;
@@ -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)
+            S = true;
         else {
             for (char& c : t) {
-                if(isdigit(c))r += c;
+                if (isdigit(c))
+                    r += c;
             }
             break;
         }
@@ -222,7 +237,8 @@ std::vector<std::string> GetID(const std::string& log){
         }
         for (char& c : t) {
             if (c == '"') {
-                if(!S)S = true;
+                if (!S)
+                    S = true;
                 else {
                     if (r.length() > 10) {
                         Ret.emplace_back(r);
@@ -232,7 +248,8 @@ std::vector<std::string> GetID(const std::string& log){
                     continue;
                 }
             }
-            if(isdigit(c))r += c;
+            if (isdigit(c))
+                r += c;
         }
     }
     vec.clear();
@@ -253,7 +270,8 @@ std::string GetManifest(const std::string& Man){
         pos += int(ToFind.length());
         vec = vec.substr(pos);
         return vec.substr(0, vec.find('\"'));
-    }else return "";
+    } else
+        return "";
 }
 bool IDCheck(std::string Man, std::string steam) {
     bool a = false, b = true;
@@ -263,10 +281,12 @@ bool IDCheck(std::string Man, std::string steam){
     steam += "\\config\\loginusers.vdf";
     if (fs::exists(Man) && fs::exists(steam)) {
         for (const std::string& ID : GetID(steam)) {
-            if(ID == GetManifest(Man))b = false;
+            if (ID == GetManifest(Man))
+                b = false;
         }
         // if(b)Exit(6);
-    }else a = true;
+    } else
+        a = true;
     return a;
 }
 void LegitimacyCheck() {
@@ -307,11 +327,13 @@ void LegitimacyCheck(){
     LONG dwRegOPenKey = OpenKey(HKEY_CURRENT_USER, K3.c_str(), &hKey);
     if (dwRegOPenKey == ERROR_SUCCESS) {
         Result = QueryKey(hKey, 3);
-        if(Result.empty())lowExit(3);
+        if (Result.empty())
+            lowExit(3);
         // if(IDCheck(Result,T))lowExit(5);
         GameDir = Result;
         // TraceBack++;
-    }else lowExit(4);
+    } else
+        lowExit(4);
     K3.clear();
     Result.clear();
     RegCloseKey(hKey);
@@ -345,7 +367,8 @@ std::string CheckVer(const std::string &dir){
 
     vec = vec.substr(vec.find_last_of("version"), vec.find_last_of('"'));
     for (const char& a : vec) {
-        if(isdigit(a) || a == '.')temp+=a;
+        if (isdigit(a) || a == '.')
+            temp += a;
     }
     return temp;
 }

src/Security/Login.cpp

@@ -7,23 +7,28 @@
 ///
 
 #include "Http.h"
-#include <filesystem>
 #include "Logger.h"
+#include <filesystem>
 #include <fstream>
-#include "Json.h"
+#include <nlohmann/json.hpp>
 
 namespace fs = std::filesystem;
 std::string PublicKey;
+std::string PrivateKey;
 extern bool LoginAuth;
-std::string Role;
+extern std::string Username;
+extern std::string UserRole;
+extern int UserID;
 
 void UpdateKey(const char* newKey) {
     if (newKey && std::isalnum(newKey[0])) {
+        PrivateKey = newKey;
         std::ofstream Key("key");
         if (Key.is_open()) {
             Key << newKey;
             Key.close();
-        }else fatal("Cannot write to disk!");
+        } else
+            fatal("Cannot write to disk!");
     } else if (fs::exists("key")) {
         remove("key");
     }
@@ -42,41 +47,56 @@ std::string GetFail(const std::string& R){
 
 std::string Login(const std::string& fields) {
     if (fields == "LO") {
+        Username = "";
+        UserRole = "";
+        UserID = -1;
         LoginAuth = false;
         UpdateKey(nullptr);
         return "";
     }
     info("Attempting to authenticate...");
+    try {
         std::string Buffer = HTTP::Post("https://auth.beammp.com/userlogin", fields);
-    json::Document d;
+
-    d.Parse(Buffer.c_str());
         if (Buffer == "-1") {
             return GetFail("Failed to communicate with the auth system!");
         }
 
-    if (Buffer.at(0) != '{' || d.HasParseError()) {
+        nlohmann::json d = nlohmann::json::parse(Buffer, nullptr, false);
+
+        if (Buffer.at(0) != '{' || d.is_discarded()) {
             error(Buffer);
             return GetFail("Invalid answer from authentication servers, please try again later!");
         }
-    if(d.HasMember("success") && !d["success"].IsNull() && d["success"].GetBool()){
+        if (d.contains("success") && d["success"].get<bool>()) {
             LoginAuth = true;
-        if(d.HasMember("private_key") && !d["private_key"].IsNull()){
+            if (d.contains("username")) {
-            UpdateKey(d["private_key"].GetString());
+                Username = d["username"].get<std::string>();
             }
-        if(d.HasMember("public_key") && !d["public_key"].IsNull()){
+            if (d.contains("role")) {
-            PublicKey = d["public_key"].GetString();
+                UserRole = d["role"].get<std::string>();
+            }
+            if (d.contains("id")) {
+                UserID = d["id"].get<int>();
+            }
+            if (d.contains("private_key")) {
+                UpdateKey(d["private_key"].get<std::string>().c_str());
+            }
+            if (d.contains("public_key")) {
+                PublicKey = d["public_key"].get<std::string>();
             }
             info("Authentication successful!");
-    }else info("Authentication failed!");
+        } else
-    if(d.HasMember("message") && !d["message"].IsNull()){
+            info("Authentication failed!");
-        d.RemoveMember("private_key");
+        if (d.contains("message")) {
-        d.RemoveMember("public_key");
+            d.erase("private_key");
-        rapidjson::StringBuffer buffer;
+            d.erase("public_key");
-        rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+            return d.dump();
-        d.Accept(writer);
-        return buffer.GetString();
         }
         return GetFail("Invalid message parsing!");
+    } catch (const std::exception& e) {
+        return GetFail(e.what());
+    }
 }
 
 void CheckLocalKey() {
@@ -97,18 +117,26 @@ void CheckLocalKey(){
 
             Buffer = HTTP::Post("https://auth.beammp.com/userlogin", R"({"pk":")" + Buffer + "\"}");
 
-            json::Document d;
+            nlohmann::json d = nlohmann::json::parse(Buffer, nullptr, false);
-            d.Parse(Buffer.c_str());
+
-            if (Buffer == "-1" || Buffer.at(0) != '{' || d.HasParseError()) {
+            if (Buffer == "-1" || Buffer.at(0) != '{' || d.is_discarded()) {
                 error(Buffer);
                 info("Invalid answer from authentication servers.");
                 UpdateKey(nullptr);
             }
-            if(d.HasMember("success") && d["success"].GetBool()){
+            if (d["success"].get<bool>()) {
                 LoginAuth = true;
-                UpdateKey(d["private_key"].GetString());
+                UpdateKey(d["private_key"].get<std::string>().c_str());
-                PublicKey = d["public_key"].GetString();
+                PublicKey = d["public_key"].get<std::string>();
-                Role = d["role"].GetString();
+                if (d.contains("username")) {
+                    Username = d["username"].get<std::string>();
+                }
+                if (d.contains("role")) {
+                    UserRole = d["role"].get<std::string>();
+                }
+                if (d.contains("id")) {
+                    UserID = d["id"].get<int>();
+                }
                 // info(Role);
             } else {
                 info("Auto-Authentication unsuccessful please re-login!");
@@ -118,5 +146,6 @@ void CheckLocalKey(){
             warn("Could not open saved key!");
             UpdateKey(nullptr);
         }
-    }else UpdateKey(nullptr);
+    } else
+        UpdateKey(nullptr);
 }

src/Startup.cpp

@@ -5,43 +5,86 @@
 ///
 /// Created by Anonymous275 on 7/16/2020
 ///
+
 #include "zip_file.h"
+#include <charconv>
+#include <httplib.h>
+#include <nlohmann/json.hpp>
 #include <string>
 #if defined(_WIN32)
 #include <windows.h>
 #elif defined(__linux__)
 #include <unistd.h>
 #endif
-#include "Discord/discord_info.h"
+#include "Http.h"
+#include "Logger.h"
 #include "Network/network.hpp"
 #include "Security/Init.h"
-#include <filesystem>
 #include "Startup.h"
-#include "Logger.h"
+#include "hashpp.h"
+#include <filesystem>
 #include <fstream>
 #include <thread>
-#include "Http.h"
-#include "Json.h"
 
 extern int TraceBack;
 bool Dev = false;
+int ProxyPort = 0;
+
 namespace fs = std::filesystem;
 
+struct Version {
+    uint8_t major;
+    uint8_t minor;
+    uint8_t patch;
+    Version(uint8_t major, uint8_t minor, uint8_t patch);
+    Version(const std::array<uint8_t, 3>& v);
+};
+
+std::array<uint8_t, 3> VersionStrToInts(const std::string& str) {
+    std::array<uint8_t, 3> Version;
+    std::stringstream ss(str);
+    for (uint8_t& i : Version) {
+        std::string Part;
+        std::getline(ss, Part, '.');
+        std::from_chars(&*Part.begin(), &*Part.begin() + Part.size(), i);
+    }
+    return Version;
+}
+
+bool IsOutdated(const Version& Current, const Version& Newest) {
+    if (Newest.major > Current.major) {
+        return true;
+    } else if (Newest.major == Current.major && Newest.minor > Current.minor) {
+        return true;
+    } else if (Newest.major == Current.major && Newest.minor == Current.minor && Newest.patch > Current.patch) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+Version::Version(uint8_t major, uint8_t minor, uint8_t patch)
+    : major(major)
+    , minor(minor)
+    , patch(patch) { }
+
+Version::Version(const std::array<uint8_t, 3>& v)
+    : Version(v[0], v[1], v[2]) {
+}
+
+std::string GetEN() {
 #if defined(_WIN32)
-std::string GetEN(){
     return "BeamMP-Launcher.exe";
-}
 #elif defined(__linux__)
-std::string GetEN(){
     return "BeamMP-Launcher";
-}
 #endif
+}
 
 std::string GetVer() {
     return "2.0";
 }
 std::string GetPatch() {
-    return ".82";
+    return ".99";
 }
 
 std::string GetEP(char* P) {
@@ -106,54 +149,46 @@ void CheckName(int argc,char* args[]){
     std::string DN = GetEN(), CDir = args[0], FN = CDir.substr(CDir.find_last_of('/') + 1);
 #endif
     if (FN != DN) {
-        if(fs::exists(DN))remove(DN.c_str());
+        if (fs::exists(DN))
-        if(fs::exists(DN))ReLaunch(argc,args);
+            remove(DN.c_str());
+        if (fs::exists(DN))
+            ReLaunch(argc, args);
         std::rename(FN.c_str(), DN.c_str());
         URelaunch(argc, args);
     }
 }
 
 void CheckForUpdates(int argc, char* args[], const std::string& CV) {
-    std::string link;
+    std::string LatestHash = HTTP::Get("https://backend.beammp.com/sha/launcher?branch=" + Branch + "&pk=" + PublicKey);
-    std::string HTTP = HTTP::Get("https://beammp.com/builds/launcher?version=true");
+    std::string LatestVersion = HTTP::Get(
-    bool fallback = false;
+        "https://backend.beammp.com/version/launcher?branch=" + Branch + "&pk=" + PublicKey);
-    if(HTTP.find_first_of("0123456789") == std::string::npos){
-        HTTP = HTTP::Get("https://backup1.beammp.com/builds/launcher?version=true");
-        fallback = true;
-        if(HTTP.find_first_of("0123456789") == std::string::npos) {
-            fatal("Primary Servers Offline! sorry for the inconvenience!");
-        }
-    }
-    if(fallback){
-        link = "https://backup1.beammp.com/builds/launcher?download=true";
-    }else link = "https://beammp.com/builds/launcher?download=true";
 
+    transform(LatestHash.begin(), LatestHash.end(), LatestHash.begin(), ::tolower);
     std::string EP(GetEP() + GetEN()), Back(GetEP() + "BeamMP-Launcher.back");
 
-    if(fs::exists(Back))remove(Back.c_str());
+    std::string FileHash = hashpp::get::getFileHash(hashpp::ALGORITHMS::SHA2_256, EP);
-
-    if(HTTP > CV){
 #if defined(_WIN32)
-        system("cls");
 #elif defined(__linux__)
     system("clear");
 #endif
-        info("Update found!");
-        info("Updating...");
-        if(std::rename(EP.c_str(), Back.c_str()))error("failed creating a backup!");
 
-        if(!HTTP::Download(link, EP)){
+    if (FileHash != LatestHash && IsOutdated(Version(VersionStrToInts(GetVer() + GetPatch())), Version(VersionStrToInts(LatestVersion))) && !Dev) {
-            error("Launcher Update failed! trying again...");
+        info("Launcher update found!");
-            std::this_thread::sleep_for(std::chrono::seconds(2));
+#if defined(__linux__)
-
+        error("Auto update is NOT implemented for the Linux version. Please update manually ASAP as updates contain security patches.");
-            if(!HTTP::Download(link, EP)){
+#else
-                error("Launcher Update failed!");
+        fs::remove(Back);
-                std::this_thread::sleep_for(std::chrono::seconds(5));
+        fs::rename(EP, Back);
-                ReLaunch(argc,args);
+        info("Downloading Launcher update " + LatestHash);
-            }
+        HTTP::Download(
-        }
+            "https://backend.beammp.com/builds/launcher?download=true"
+            "&pk="
+                + PublicKey + "&branch=" + Branch,
+            EP);
         URelaunch(argc, args);
-    }else info("Launcher version is up to date");
+#endif
+    } else
+        info("Launcher version is up to date");
     TraceBack++;
 }
 
@@ -166,7 +201,8 @@ void CustomPort(int argc, char* argv[]){
                 warn("Running on custom port : " + std::to_string(DEFAULT_PORT));
             }
         }
-        if(argc > 2)Dev = true;
+        if (argc > 2)
+            Dev = true;
     }
 }
 
@@ -174,7 +210,8 @@ void CustomPort(int argc, char* argv[]){
 void LinuxPatch() {
     HKEY hKey = nullptr;
     LONG result = RegOpenKeyEx(HKEY_CURRENT_USER, R"(Software\Wine)", 0, KEY_READ, &hKey);
-    if (result != ERROR_SUCCESS || getenv("USER") == nullptr)return;
+    if (result != ERROR_SUCCESS || getenv("USER") == nullptr)
+        return;
     RegCloseKey(hKey);
     info("Wine/Proton Detected! If you are on windows delete HKEY_CURRENT_USER\\Software\\Wine in regedit");
     info("Applying patches...");
@@ -194,31 +231,6 @@ void LinuxPatch(){
     }
     RegCloseKey(hKey);
 
-    std::string Path = R"(Z:\home\)" + std::string(getenv("USER")) + R"(\.steam\steam\Steam.exe)";
-
-    if(!fs::exists(Path)) {
-        std::ofstream ofs(Path);
-        if (!ofs.is_open()) {
-            fatal("Failed to create file \"" + Path + "\"");
-            return;
-        } else ofs.close();
-    }
-
-    result = RegOpenKeyEx(HKEY_CURRENT_USER, R"(Software\Valve\Steam)", 0, KEY_ALL_ACCESS, &hKey);
-    if (result != ERROR_SUCCESS){
-        fatal(R"(failed to open HKEY_CURRENT_USER\Software\Valve\Steam)");
-        return;
-    }
-
-    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)");
-        return;
-    }
-
-    RegCloseKey(hKey);
-
     info("Patched!");
 }
 #endif
@@ -233,7 +245,6 @@ void InitLauncher(int argc, char* argv[]) {
     CheckLocalKey();
     ConfigInit();
     CustomPort(argc, argv);
-    Discord_Main();
     CheckForUpdates(argc, argv, std::string(GetVer()) + GetPatch());
 }
 #elif defined(__linux__)
@@ -253,46 +264,46 @@ size_t DirCount(const std::filesystem::path& path){
 }
 
 void CheckMP(const std::string& Path) {
-    if (!fs::exists(Path))return;
+    if (!fs::exists(Path))
+        return;
     size_t c = DirCount(fs::path(Path));
     try {
         for (auto& p : fs::directory_iterator(Path)) {
             if (p.exists() && !p.is_directory()) {
-                std::string Name = p.path().filename().u8string();
+                std::string Name = p.path().filename().string();
-                for(char&Ch : Name)Ch = char(tolower(Ch));
+                for (char& Ch : Name)
-                if(Name != "beammp.zip")fs::remove(p.path());
+                    Ch = char(tolower(Ch));
+                if (Name != "beammp.zip")
+                    fs::remove(p.path());
             }
         }
     } catch (...) {
         fatal("We were unable to clean the multiplayer mods folder! Is the game still running or do you have something open in that folder?");
     }
-
 }
 
 void EnableMP() {
     std::string File(GetGamePath() + "mods/db.json");
-    if(!fs::exists(File))return;
+    if (!fs::exists(File))
+        return;
     auto Size = fs::file_size(File);
-    if(Size < 2)return;
+    if (Size < 2)
+        return;
     std::ifstream db(File);
     if (db.is_open()) {
         std::string Data(Size, 0);
         db.read(&Data[0], Size);
         db.close();
-        json::Document d;
+        nlohmann::json d = nlohmann::json::parse(Data, nullptr, false);
-        d.Parse(Data.c_str());
+        if (Data.at(0) != '{' || d.is_discarded()) {
-        if(Data.at(0) != '{' || d.HasParseError()){
             // error("Failed to parse " + File); //TODO illegal formatting
             return;
         }
-        if(d.HasMember("mods") && !d["mods"].IsNull() && d["mods"].HasMember("multiplayerbeammp") && !d["mods"]["multiplayerbeammp"].IsNull()){
+        if (d.contains("mods") && d["mods"].contains("multiplayerbeammp")) {
             d["mods"]["multiplayerbeammp"]["active"] = true;
-            rapidjson::StringBuffer buffer;
-            rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
-            d.Accept(writer);
             std::ofstream ofs(File);
             if (ofs.is_open()) {
-                ofs << buffer.GetString();
+                ofs << d.dump();
                 ofs.close();
             } else {
                 error("Failed to write " + File);
@@ -308,7 +319,12 @@ void PreGame(const std::string& GamePath){
     CheckMP(GetGamePath() + "mods/multiplayer");
 
     if (!Dev) {
-        info("Downloading mod please wait...");
+        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");
@@ -324,16 +340,76 @@ void PreGame(const std::string& GamePath){
         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);
+                           "&pk="
+                    + PublicKey + "&branch=" + Branch,
+                ZipPath);
+        }
 
         std::string Target(GetGamePath() + "mods/unpacked/beammp");
 
         if (fs::is_directory(Target)) {
             fs::remove_all(Target);
         }
-
+    }
-        //HTTP::Download("beammp.com/builds/client", GetGamePath() + R"(mods\multiplayer\BeamMP.zip)");
 }
 
+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,13 +5,13 @@
 ///
 /// 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() {
     while (true) {
@@ -25,6 +25,7 @@ int main(int argc, char* argv[]) {
     std::thread th(flush);
     th.detach();
 #endif
+
     GetEP(argv[0]);
 
     InitLauncher(argc, argv);
@@ -35,6 +36,7 @@ int main(int argc, char* argv[]) {
         fatal("Main 1 : " + std::string(e.what()));
     }
 
+    StartProxy();
     PreGame(GetGameDir());
     InitGame(GetGameDir());
     CoreNetwork();

vcpkg.json

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