v2.0.84

- HTTP Proxy for backend.beammp.com
- Fix Attempt for mod loading, game detecting partial zip file
- Use nlohmann JSON
- Update vcpkg parameters and commit ID
- Add ability to open URL using default browser with filter

.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: '16ee2ecb31788c336ace8bb14c21801efb6836e4'
             vcpkgTriplet: 'x64-windows-static'
 
       - name: Create Build Environment

.github/workflows/release-build.yml

@@ -42,9 +42,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

CMakeLists.txt

@@ -12,10 +12,13 @@ set(CMAKE_CXX_STANDARD 17)
 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")
+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")
 
+
 if (WIN32)
     find_package(ZLIB REQUIRED)
     find_package(OpenSSL REQUIRED)
@@ -23,8 +26,14 @@ if (WIN32)
     set(VcpkgRoot ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET})
     include_directories(${VcpkgRoot}/include)
     link_directories(${VcpkgRoot}/lib)
-    target_link_libraries(${PROJECT_NAME} PRIVATE ${VcpkgRoot}/lib/discord-rpc.lib
+    target_link_libraries(${PROJECT_NAME} PRIVATE
-            ZLIB::ZLIB OpenSSL::SSL OpenSSL::Crypto ws2_32)
+            ZLIB::ZLIB OpenSSL::SSL OpenSSL::Crypto ws2_32 httplib::httplib nlohmann_json::nlohmann_json)
+
+    if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
+        target_link_libraries(${PROJECT_NAME} PRIVATE ${VcpkgRoot}/lib/discord-rpc.lib)
+    else ()
+        target_link_libraries(${PROJECT_NAME} PRIVATE ${VcpkgRoot}/debug/lib/discord-rpc.lib)
+    endif()
 else(WIN32) #MINGW
     add_definitions("-D_WIN32_WINNT=0x0600")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Os -s --static")

include/Http.h

@@ -16,5 +16,4 @@ public:
     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/Network/network.h

@@ -14,6 +14,7 @@ extern bool Dev;
 extern int ping;
 
 [[noreturn]] void CoreNetwork();
+extern int ProxyPort;
 extern int ClientID;
 extern int LastPort;
 extern bool ModLoaded;
@@ -27,6 +28,7 @@ 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);

include/Startup.h

@@ -12,5 +12,6 @@ std::string GetEP(char*P = nullptr);
 std::string GetGamePath();
 std::string GetVer();
 std::string GetEN();
+void StartProxy();
 void ConfigInit();
 extern bool Dev;

src/Config.cpp

@@ -2,18 +2,18 @@
 /// Created by Anonymous275 on 2/23/2021
 ///
 
+#include <nlohmann/json.hpp>
 #include "Network/network.h"
 #include <filesystem>
 #include "Logger.h"
 #include <fstream>
-#include "Json.h"
 #include <cstdint>
 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,8 +21,8 @@ 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));
     }
 }
@@ -35,10 +35,9 @@ 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!");

src/GameStart.cpp

@@ -61,6 +61,7 @@ void StartGame(std::string Dir){
     std::this_thread::sleep_for(std::chrono::seconds(5));
     exit(2);
 }
+
 void InitGame(const std::string& Dir){
     if(!Dev){
         std::thread Game(StartGame, Dir);

src/Network/Core.cpp

@@ -5,9 +5,10 @@
 ///
 /// Created by Anonymous275 on 7/20/2020
 ///
+
 #include "Network/network.h"
 #include "Security/Init.h"
-
+#include <regex>
 #include "Http.h"
 #include <winsock2.h>
 #include <ws2tcpip.h>
@@ -47,6 +48,13 @@ 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);
@@ -69,6 +77,14 @@ void Parse(std::string Data,SOCKET CSocket){
             if(ListOfMods == "-")Data = "L";
             else Data = "L"+ListOfMods;
             break;
+        case 'O': //open default browser with URL
+            if(IsAllowedLink(Data.substr(1))) {
+                ShellExecuteA(nullptr, "open", Data.substr(1).c_str(), nullptr, nullptr,SW_SHOW); ///TODO: Look at when working on linux port
+            }
+            break;
+        case 'P':
+            Data = Code + std::to_string(ProxyPort);
+            break;
         case 'U':
             if(SubCode == 'l')Data = UlStatus;
             if(SubCode == 'p'){

src/Network/Http.cpp

@@ -15,13 +15,6 @@
 #include <cmath>
 #include <httplib.h>
 
-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) {
     static std::mutex Lock;
@@ -35,7 +28,7 @@ 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);
@@ -44,7 +37,7 @@ std::string HTTP::Get(const std::string &IP) {
         if(isDownload) {
             std::cout << "\n";
         }
-        error("HTTP Get failed on " + Codes_[res.error()]);
+        error("HTTP Get failed on " + to_string(res.error()));
     }
 
     return Ret;
@@ -63,23 +56,23 @@ 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()]);
+            error("HTTP Post failed on " + to_string(res.error()));
         }
     }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()]);
+            error("HTTP Post failed on " + to_string(res.error()));
         }
     }
 

src/Network/Resources.cpp

@@ -102,7 +102,7 @@ std::string Auth(SOCKET Sock){
     return Res;
 }
 
-void UpdateUl(bool D,const std::string&msg){
+void UpdateUl(bool D,const std::string& msg){
     if(D)UlStatus = "UlDownloading Resource " + msg;
     else UlStatus = "UlLoading Resource " + msg;
 }
@@ -267,8 +267,10 @@ void SyncResources(SOCKET Sock){
                     if(!fs::exists(GetGamePath() + "mods/multiplayer")){
                         fs::create_directories(GetGamePath() + "mods/multiplayer");
                     }
-                    fs::copy_file(a, GetGamePath() + "mods/multiplayer" + a.substr(a.find_last_of('/')),
+                    auto name = GetGamePath() + "mods/multiplayer" + a.substr(a.find_last_of('/'));
-                                  fs::copy_options::overwrite_existing);
+                    auto tmp_name = name + ".tmp";
+                    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;

src/Security/Login.cpp

@@ -6,19 +6,22 @@
 /// Created by Anonymous275 on 11/26/2020
 ///
 
+#include <nlohmann/json.hpp>
 #include "Http.h"
 #include <filesystem>
 #include "Logger.h"
 #include <fstream>
-#include "Json.h"
+
 
 namespace fs = std::filesystem;
 std::string PublicKey;
+std::string PrivateKey;
 extern bool LoginAuth;
 std::string Role;
 
 void UpdateKey(const char* newKey){
     if(newKey && std::isalnum(newKey[0])){
+        PrivateKey = newKey;
         std::ofstream Key("key");
         if(Key.is_open()){
             Key << newKey;
@@ -48,33 +51,31 @@ std::string Login(const std::string& fields){
     }
     info("Attempting to authenticate...");
     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["success"].IsNull() && d["success"].GetBool()){
+    if(d.contains("success") && d["success"].get<bool>()){
         LoginAuth = true;
-        if(!d["private_key"].IsNull()){
+        if(!d.contains("private_key")) {
-            UpdateKey(d["private_key"].GetString());
+            UpdateKey(d["private_key"].get<std::string>().c_str());
         }
-        if(!d["public_key"].IsNull()){
+        if(!d.contains("public_key")){
-            PublicKey = d["public_key"].GetString();
+            PublicKey = d["public_key"].get<std::string>();
         }
         info("Authentication successful!");
     }else info("Authentication failed!");
-    if(!d["message"].IsNull()){
+    if(!d.contains("message")){
-        d.RemoveMember("private_key");
+        d.erase("private_key");
-        d.RemoveMember("public_key");
+        d.erase("public_key");
-        rapidjson::StringBuffer buffer;
+        return d.dump();
-        rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
-        d.Accept(writer);
-        return buffer.GetString();
     }
     return GetFail("Invalid message parsing!");
 }
@@ -97,18 +98,18 @@ 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["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();
+                Role = d["role"].get<std::string>();
                 //info(Role);
             }else{
                 info("Auto-Authentication unsuccessful please re-login!");

src/Startup.cpp

@@ -5,6 +5,9 @@
 ///
 /// Created by Anonymous275 on 7/16/2020
 ///
+
+#include <nlohmann/json.hpp>
+#include <httplib.h>
 #include "zip_file.h"
 #include <windows.h>
 #include "Discord/discord_info.h"
@@ -16,10 +19,11 @@
 #include <fstream>
 #include <thread>
 #include "Http.h"
-#include "Json.h"
 
 extern int TraceBack;
 bool Dev = false;
+int ProxyPort = 0;
+
 namespace fs = std::filesystem;
 
 std::string GetEN(){
@@ -29,7 +33,7 @@ std::string GetVer(){
     return "2.0";
 }
 std::string GetPatch(){
-    return ".83";
+    return ".84";
 }
 
 std::string GetEP(char*P){
@@ -195,20 +199,16 @@ void EnableMP(){
         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["mods"].IsNull() && !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);
@@ -248,3 +248,39 @@ void PreGame(const std::string& GamePath){
     }
 
 }
+
+void StartProxy() {
+    std::thread proxy([&](){
+        httplib::Server HTTPProxy;
+
+        HTTPProxy.Get("/:any", [](const httplib::Request& req, httplib::Response& res) {
+            httplib::Client cli("https://backend.beammp.com");
+            auto headers = req.headers;
+            if (req.has_header("X-BMP-Authentication")) {
+                headers.emplace("X-BMP-Authentication", PrivateKey);
+            }
+            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("/:any", [](const httplib::Request& req, httplib::Response& res) {
+            httplib::Client cli("https://backend.beammp.com");
+            auto headers = req.headers;
+            if (req.has_header("X-BMP-Authentication")) {
+                headers.emplace("X-BMP-Authentication", PrivateKey);
+            }
+            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");
+            }
+        });
+
+        ProxyPort = HTTPProxy.bind_to_any_port("0.0.0.0");
+        HTTPProxy.listen_after_bind();
+    });
+    proxy.detach();
+}

src/main.cpp

@@ -21,20 +21,21 @@
 }
 
 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();