Bump version

If, for example, the client requests the serverlist multiple times and
then tries to login the launcher will first wait for those requests to
finish. Thereby putting the other core communication (such as login) on
hold.

.gitignore

@@ -12,3 +12,4 @@ Resources/
 bin/
 compile_commands.json
 key
+out/

include/Http.h

@@ -17,5 +17,4 @@ public:
     static void StartProxy();
 public:
     static bool isDownload;
-    static inline bool SkipSslVerify = false;
 };

src/Compressor.cpp

@@ -25,7 +25,7 @@ std::vector<char> Comp(std::span<const char> input) {
         reinterpret_cast<const Bytef*>(input.data()),
         static_cast<uLongf>(input.size()));
     if (res != Z_OK) {
-        error("zlib compress() failed: " + std::to_string(res));
+        error("zlib compress() failed (code: " + std::to_string(res) + ", message: " + zError(res) + ")");
         throw std::runtime_error("zlib compress() failed");
     }
     debug("zlib compressed " + std::to_string(input.size()) + " B to " + std::to_string(output_size) + " B");
@@ -52,7 +52,7 @@ std::vector<char> DeComp(std::span<const char> input) {
             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));
+            error("zlib uncompress() failed (code: " + std::to_string(res) + ", message: " + zError(res) + ")");
             throw std::runtime_error("zlib uncompress() failed");
         } else if (res == Z_OK) {
             break;

src/Network/Core.cpp

@@ -30,8 +30,11 @@
 #include <nlohmann/json.hpp>
 #include <set>
 #include <thread>
+#include <mutex>
 #include "Options.h"
 
+#include <future>
+
 extern int TraceBack;
 std::set<std::string>* ConfList = nullptr;
 bool TCPTerminate = false;
@@ -87,7 +90,11 @@ void StartSync(const std::string& Data) {
     info("Connecting to server");
 }
 
+std::mutex sendMutex;
+
 void CoreSend(std::string data) {
+    std::lock_guard lock(sendMutex);
+    
     if (CoreSocket != -1) {
         int res = send(CoreSocket, (data + "\n").c_str(), int(data.size()) + 1, 0);
         if (res < 0) {
@@ -97,7 +104,7 @@ void CoreSend(std::string data) {
 }
 
 bool IsAllowedLink(const std::string& Link) {
-    std::regex link_pattern(R"(https:\/\/(?:\w+)?(?:\.)?(?:beammp\.com|discord\.gg|patreon\.com\/BeamMP))");
+    std::regex link_pattern(R"(https:\/\/(?:\w+)?(?:\.)?(?:beammp\.com|beammp\.gg|github\.com\/BeamMP\/|discord\.gg|patreon\.com\/BeamMP))");
     std::smatch link_match;
     return std::regex_search(Link, link_match, link_pattern) && link_match.position() == 0;
 }
@@ -110,11 +117,15 @@ void Parse(std::string Data, SOCKET CSocket) {
     case 'A':
         Data = Data.substr(0, 1);
         break;
-    case 'B':
+    case 'B': {
-        NetReset();
+            NetReset();
-        Terminate = true;
+            Terminate = true;
-        TCPTerminate = true;
+            TCPTerminate = true;
-        Data = Code + HTTP::Get("https://backend.beammp.com/servers-info");
+            Data.clear();
+            auto future = std::async(std::launch::async, []() {
+                CoreSend("B" + HTTP::Get("https://backend.beammp.com/servers-info"));
+            });
+        }
         break;
     case 'C':
         StartSync(Data);
@@ -210,7 +221,10 @@ void Parse(std::string Data, SOCKET CSocket) {
             }
             Data = "N" + Auth.dump();
         } else {
-            Data = "N" + Login(Data.substr(Data.find(':') + 1));
+            auto future = std::async(std::launch::async, [data = std::move(Data)]() {
+                CoreSend("N" + Login(data.substr(data.find(':') + 1)));
+            });
+            Data.clear();
         }
         break;
     case 'W':
@@ -226,12 +240,8 @@ void Parse(std::string Data, SOCKET CSocket) {
         Data.clear();
         break;
     }
-    if (!Data.empty() && CSocket != -1) {
+    if (!Data.empty())
-        int res = send(CSocket, (Data + "\n").c_str(), int(Data.size()) + 1, 0);
+        CoreSend(Data);
-        if (res < 0) {
-            debug("(Core) send failed with error: " + std::to_string(WSAGetLastError()));
-        }
-    }
 }
 void GameHandler(SOCKET Client) {
     CoreSocket = Client;
@@ -306,7 +316,7 @@ void CoreMain() {
     hints.ai_socktype = SOCK_STREAM;
     hints.ai_protocol = IPPROTO_TCP;
     hints.ai_flags = AI_PASSIVE;
-    iRes = getaddrinfo(nullptr, std::to_string(options.port).c_str(), &hints, &res);
+    iRes = getaddrinfo("127.0.0.1", std::to_string(options.port).c_str(), &hints, &res);
     if (iRes) {
         debug("(Core) addr info failed with error: " + std::to_string(iRes));
         WSACleanup();

src/Network/Http.cpp

@@ -77,7 +77,7 @@ std::string HTTP::Get(const std::string& IP) {
         curl_easy_setopt(curl, CURLOPT_URL, IP.c_str());
         curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, CurlWriteCallback);
         curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void*)&Ret);
-        curl_easy_setopt(curl, CURLOPT_TIMEOUT, 10); // seconds
+        curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 10); // seconds
         curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
         res = curl_easy_perform(curl);
         if (res != CURLE_OK) {
@@ -105,7 +105,7 @@ std::string HTTP::Post(const std::string& IP, const std::string& Fields) {
         struct curl_slist* list = nullptr;
         list = curl_slist_append(list, "Content-Type: application/json");
         curl_easy_setopt(curl, CURLOPT_HTTPHEADER, list);
-        curl_easy_setopt(curl, CURLOPT_TIMEOUT, 10); // seconds
+        curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 10); // seconds
         curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
         res = curl_easy_perform(curl);
         curl_slist_free_all(list);
@@ -261,7 +261,7 @@ void HTTP::StartProxy() {
             handle_request(req, res);
         });
 
-        ProxyPort = HTTPProxy.bind_to_any_port("0.0.0.0");
+        ProxyPort = HTTPProxy.bind_to_any_port("127.0.0.1");
         debug("HTTP Proxy listening on port " + std::to_string(ProxyPort));
         HTTPProxy.listen_after_bind();
     });

src/Network/Resources.cpp

@@ -362,10 +362,15 @@ std::string GetSha256HashReallyFast(const std::string& filename) {
 }
 
 struct ModInfo {
-    static std::vector<ModInfo> ParseModInfosFromPacket(const std::string& packet) {
+    static std::pair<bool, std::vector<ModInfo>> ParseModInfosFromPacket(const std::string& packet) {
+        bool success = false;
         std::vector<ModInfo> modInfos;
         try {
             auto json = nlohmann::json::parse(packet);
+            if (json.empty()) {
+                return std::make_pair(true, modInfos);
+            }
+
             for (const auto& entry : json) {
                 ModInfo modInfo {
                     .FileName = entry["file_name"],
@@ -374,13 +379,13 @@ struct ModInfo {
                     .HashAlgorithm = entry["hash_algorithm"],
                 };
                 modInfos.push_back(modInfo);
+                success = true;
             }
         } catch (const std::exception& e) {
             debug(std::string("Failed to receive mod list: ") + e.what());
-            error("Failed to receive mod list!");
+            warn("Failed to receive new mod list format! This server may be outdated, but everything should still work as expected.");
-            // TODO: Cry and die
         }
-        return modInfos;
+        return std::make_pair(success, modInfos);
     }
     std::string FileName;
     size_t FileSize;
@@ -389,6 +394,13 @@ struct ModInfo {
 };
 
 void NewSyncResources(SOCKET Sock, const std::string& Mods, const std::vector<ModInfo> ModInfos) {
+    if (ModInfos.empty()) {
+        CoreSend("L");
+        TCPSend("Done", Sock);
+        info("Done!");
+        return;
+    }
+
     if (!SecurityWarning())
         return;
 
@@ -511,11 +523,17 @@ void NewSyncResources(SOCKET Sock, const std::string& Mods, const std::vector<Mo
 void SyncResources(SOCKET Sock) {
     std::string Ret = Auth(Sock);
 
-    auto ModInfos = ModInfo::ParseModInfosFromPacket(Ret);
+    debug("Mod info: " + Ret);
 
-    if (!ModInfos.empty()) {
+    if (Ret.starts_with("R")) {
-        NewSyncResources(Sock, Ret, ModInfos);
+        debug("This server is likely outdated, not trying to parse new mod info format");
-        return;
+    } else {
+        auto [success, modInfo] = ModInfo::ParseModInfosFromPacket(Ret);
+
+        if (success) {
+            NewSyncResources(Sock, Ret, modInfo);
+            return;
+        }
     }
 
     if (Ret.empty())

src/Security/Login.cpp

@@ -91,6 +91,7 @@ std::string Login(const std::string& fields) {
         if (d.contains("message")) {
             d.erase("private_key");
             d.erase("public_key");
+            debug("Authentication result: " + d["message"].get<std::string>());
             return d.dump();
         }
         return GetFail("Invalid message parsing!");

src/Startup.cpp

@@ -82,10 +82,10 @@ std::string GetEN() {
 }
 
 std::string GetVer() {
-    return "2.2";
+    return "2.3";
 }
 std::string GetPatch() {
-    return ".0";
+    return ".2";
 }
 
 std::string GetEP(const char* P) {
@@ -232,11 +232,9 @@ void LinuxPatch() {
 
 void InitLauncher() {
     SetConsoleTitleA(("BeamMP Launcher v" + std::string(GetVer()) + GetPatch()).c_str());
-    InitLog();
     CheckName();
     LinuxPatch();
     CheckLocalKey();
-    ConfigInit();
     CheckForUpdates(std::string(GetVer()) + GetPatch());
 }
 #elif defined(__linux__)
@@ -245,7 +243,6 @@ void InitLauncher() {
     info("BeamMP Launcher v" + GetVer() + GetPatch());
     CheckName();
     CheckLocalKey();
-    ConfigInit();
     CheckForUpdates(std::string(GetVer()) + GetPatch());
 }
 #endif

src/main.cpp

@@ -38,23 +38,10 @@ int main(int argc, const char** argv) try {
 
     curl_global_init(CURL_GLOBAL_ALL);
 
-#if defined(_WIN32)
-    system("cls");
-#elif defined(__linux__)
-    system("clear");
-#endif
-
-
     GetEP(argv[0]);
 
-    for (int i = 0; i < argc; ++i) {
-        if (std::string_view(argv[i]) == "--skip-ssl-verify") {
-            info("SSL verification skip enabled");
-            HTTP::SkipSslVerify = true;
-        }
-    }
-
     InitLog();
+    ConfigInit();
     InitOptions(argc, argv, options);
     InitLauncher();