Made get and download try a second time on fail

CMakeLists.txt

@@ -37,4 +37,4 @@ else(WIN32) #MINGW
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Os -s --static")
     target_link_libraries(${PROJECT_NAME} ssl crypto ws2_32 ssp crypt32 z CURL::libcurl)
 endif(WIN32)
-target_include_directories(${PROJECT_NAME} PRIVATE "include")
+target_include_directories(${PROJECT_NAME} PRIVATE "include" "include/Network")

include/Http.h

@@ -11,9 +11,9 @@
 #include <string>
 class HTTP {
 public:
-    static bool Download(const std::string& IP, const beammp_fs_string& Path, const std::string& Hash);
+    static bool Download(const std::string& IP, const beammp_fs_string& Path, const std::string& Hash, const bool& redirect = true);
-    static std::string Post(const std::string& IP, const std::string& Fields);
+    static std::string Post(std::string IP, const std::string& Fields, const bool& redirect = true);
-    static std::string Get(const std::string& IP);
+    static std::string Get(std::string IP, const bool& redirect = true);
     static bool ProgressBar(size_t c, size_t t);
     static void StartProxy();
 public:

include/Network/RegionHandler.h

@@ -0,0 +1,22 @@
+/*
+ Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
+ Licensed under AGPL-3.0 (or later), see <https://www.gnu.org/licenses/>.
+ SPDX-License-Identifier: AGPL-3.0-or-later
+*/
+
+#pragma once
+
+#include <vector>
+#include <string>
+#include <array>
+
+class RegionHandler final {
+public:
+    RegionHandler() = delete;
+    static void TopLevelDomainFailed();
+    static std::string RegionToTopLevelDomain();
+    static std::string RedirectURL(const std::string& URL);
+private:
+    static inline unsigned int mRegionIndex { 0 };
+    const static inline std::array<std::string, 2> mValidTLDs {"beammp.com", "beammp.net"};
+};

include/Options.h

@@ -20,6 +20,7 @@ struct Options {
     bool no_update = false;
     bool no_launch = false;
     const char* user_path = nullptr;
+    std::string region;
     const char **game_arguments = nullptr;
     int game_arguments_length = 0;
     const char** argv = nullptr;

src/Config.cpp

@@ -49,6 +49,9 @@ void ParseConfig(const nlohmann::json& d) {
         deleteDuplicateMods = d["DeleteDuplicateMods"].get<bool>();
     }
 
+    if (d.contains("Region") && d["Region"].is_string()) {
+        options.region = d["Region"].get<std::string>();
+    }
 }
 
 void ConfigInit() {

src/Network/Core.cpp

@@ -5,6 +5,7 @@
 */
 
 #include "Http.h"
+#include "RegionHandler.h"
 #include "Network/network.hpp"
 #include "Security/Init.h"
 #include "Utils.h"
@@ -226,7 +227,8 @@ void Parse(std::string Data, SOCKET CSocket) {
             TCPTerminate = true;
             Data.clear();
             futures.push_back(std::async(std::launch::async, []() {
-                CoreSend("B" + HTTP::Get("https://backend.beammp.com/servers-info"));
+                std::string resp = HTTP::Get("https://backend.beammp.com/servers-info", true);
+                CoreSend("B" + resp);
             }));
         }
         break;

src/Network/GlobalHandler.cpp

@@ -51,10 +51,6 @@ int KillSocket(uint64_t Dead) {
 }
 
 void GameSend(std::string_view Data) {
-    if (!GConnected) {
-        debug("Tried to call GameSend but socket was not connected. Data: " + std::string(Data));
-        return;
-    }
     static std::mutex Lock;
     std::scoped_lock Guard(Lock);
     auto ToSend = Utils::PrependHeader<std::string_view>(Data);
@@ -77,7 +73,7 @@ void ServerSend(std::string Data, bool Rel) {
         C = Data.at(0);
     if (C == 'O' || C == 'T')
         Ack = true;
-    if (C == 'N' || C == 'W' || C == 'Y' || C == 'V' || C == 'E' || C == 'C' || C == 't')
+    if (C == 'N' || C == 'W' || C == 'Y' || C == 'V' || C == 'E' || C == 'C')
         Rel = true;
     if (compressBound(Data.size()) > 1024)
         Rel = true;
@@ -199,7 +195,6 @@ void ParserAsync(std::string_view Data) {
         return;
     case 'U':
         magic = Data.substr(1);
-        return;
     default:
         break;
     }

src/Network/Http.cpp

@@ -6,6 +6,8 @@
 
 
 #include "Http.h"
+#include "RegionHandler.h"
+#include "Options.h"
 #include <Logger.h>
 #include <Network/network.hpp>
 #include <Startup.h>
@@ -29,9 +31,12 @@ static size_t CurlWriteCallback(void* contents, size_t size, size_t nmemb, void*
 }
 
 bool HTTP::isDownload = false;
-std::string HTTP::Get(const std::string& IP) {
+std::string HTTP::Get(std::string IP, const bool& redirect) {
     std::string Ret;
     static thread_local CURL* curl = curl_easy_init();
+    if (redirect) {
+        IP = RegionHandler::RedirectURL(IP);
+    }
     if (curl) {
         CURLcode res;
         char errbuf[CURL_ERROR_SIZE];
@@ -46,7 +51,18 @@ std::string HTTP::Get(const std::string& IP) {
         if (res != CURLE_OK) {
             error("GET to " + IP + " failed: " + std::string(curl_easy_strerror(res)));
             error("Curl error: " + std::string(errbuf));
-            return "";
+            if (!redirect) {
+                return "";
+            }
+            RegionHandler::TopLevelDomainFailed();
+            IP = RegionHandler::RedirectURL(IP);
+            curl_easy_setopt(curl, CURLOPT_URL, IP.c_str());
+            res = curl_easy_perform(curl);
+            if (res != CURLE_OK) {
+                error("GET to " + IP + " failed: " + std::string(curl_easy_strerror(res)));
+                error("Curl error: " + std::string(errbuf));
+                return "";
+            }
         }
     } else {
         error("Curl easy init failed");
@@ -55,9 +71,12 @@ std::string HTTP::Get(const std::string& IP) {
     return Ret;
 }
 
-std::string HTTP::Post(const std::string& IP, const std::string& Fields) {
+std::string HTTP::Post(std::string IP, const std::string& Fields, const bool& redirect) {
     std::string Ret;
     static thread_local CURL* curl = curl_easy_init();
+    if (redirect) {
+        IP = RegionHandler::RedirectURL(IP);
+    }
     if (curl) {
         CURLcode res;
         char errbuf[CURL_ERROR_SIZE];
@@ -79,7 +98,18 @@ std::string HTTP::Post(const std::string& IP, const std::string& Fields) {
         if (res != CURLE_OK) {
             error("POST to " + IP + " failed: " + std::string(curl_easy_strerror(res)));
             error("Curl error: " + std::string(errbuf));
-            return "";
+            if (!redirect) {
+                return "";
+            }
+            RegionHandler::TopLevelDomainFailed();
+            IP = RegionHandler::RedirectURL(IP);
+            curl_easy_setopt(curl, CURLOPT_URL, IP.c_str());
+            res = curl_easy_perform(curl);
+            if (res != CURLE_OK) {
+                error("GET to " + IP + " failed: " + std::string(curl_easy_strerror(res)));
+                error("Curl error: " + std::string(errbuf));
+                return "";
+            }
         }
     } else {
         error("Curl easy init failed");
@@ -88,12 +118,12 @@ std::string HTTP::Post(const std::string& IP, const std::string& Fields) {
     return Ret;
 }
 
-bool HTTP::Download(const std::string& IP, const beammp_fs_string& Path, const std::string& Hash) {
+bool HTTP::Download(const std::string& IP, const beammp_fs_string& Path, const std::string& Hash, const bool& redirect) {
     static std::mutex Lock;
     std::scoped_lock Guard(Lock);
 
     info("Downloading an update (this may take a while)");
-    std::string Ret = Get(IP);
+    std::string Ret = Get(IP, redirect);
 
     if (Ret.empty()) {
         error("Download failed");

src/Network/RegionHandler.cpp

@@ -0,0 +1,39 @@
+/*
+ Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
+ Licensed under AGPL-3.0 (or later), see <https://www.gnu.org/licenses/>.
+ SPDX-License-Identifier: AGPL-3.0-or-later
+*/
+
+#include "RegionHandler.h"
+#include "Logger.h"
+#include "Options.h"
+
+#include <regex>
+
+void RegionHandler::TopLevelDomainFailed()
+{
+    info("Top level domain of " + mValidTLDs[mRegionIndex % mValidTLDs.size()] + " didn't respond correctly , changing domain to " + mValidTLDs[(mRegionIndex + 1) % mValidTLDs.size()]);
+    mRegionIndex++;
+}
+
+std::string RegionHandler::RegionToTopLevelDomain()
+{
+    static bool isDeveloperRegion = options.region == "Developer";
+    if (isDeveloperRegion) {
+        return "beammp.dev";
+    }
+    return mValidTLDs[mRegionIndex % mValidTLDs.size()]; // Global
+}
+
+std::string RegionHandler::RedirectURL(const std::string &URL)
+{
+    std::regex link_pattern(R"(^(https:\/\/.*)beammp\.com(\/.*)?$)");
+    std::smatch link_match;
+    if (std::regex_search(URL, link_match, link_pattern) && link_match.position() == 0) {
+        //TLD matched beammp.com
+        std::string before = link_match[1].str();                     // "https://..." up to beammp
+        std::string after  = link_match[2].matched ? link_match[2].str() : ""; // "/path" or ""
+        return before + RegionToTopLevelDomain() + after;
+    }
+    return URL; //if it didn't match, just return the unmodified URL
+}

src/Network/Resources.cpp

@@ -163,12 +163,7 @@ std::vector<char> TCPRcvRaw(SOCKET Sock, uint64_t& GRcv, uint64_t Size) {
     int i = 0;
     do {
         // receive at most some MB at a time
-        uint64_t Len = std::min<uint64_t>((Size - Rcv), 1 * 1024 * 1024);
+        int Len = std::min(int(Size - Rcv), 1 * 1024 * 1024);
-        if (Len == 0) {
-            error("Download size miscalculation");
-            break;
-        }
-
         int Temp = RecvWaitAll(Sock, &File[Rcv], Len);
         if (Temp == -1 || Temp == 0) {
             debug("Recv returned: " + std::to_string(Temp));
@@ -307,7 +302,7 @@ void InvalidResource(const std::string& File) {
 }
 
 struct ModInfo {
-    static std::optional<std::pair<bool, 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 {
@@ -328,12 +323,6 @@ struct ModInfo {
                     modInfo.Protected = entry["protected"];
                 }
 
-                if (auto fsFile = std::filesystem::path(modInfo.FileName);
-                    !fsFile.has_filename() || fsFile.filename().string() != modInfo.FileName ||
-                    !fsFile.filename().has_extension() || fsFile.filename().extension() != ".zip"){
-                    return std::nullopt;
-                }
-
                 modInfos.push_back(modInfo);
                 success = true;
             }
@@ -589,17 +578,8 @@ void NewSyncResources(SOCKET Sock, const std::string& Mods, const std::vector<Mo
                 c = ::tolower(c);
             }
 #endif
-            auto name = std::filesystem::path(GetGamePath()) / "mods/multiplayer" / FName;
-            auto tmp_name = name;
-            tmp_name += ".tmp";
 
-            std::error_code ec;
+            fs::copy_file(PathToSaveTo, std::filesystem::path(GetGamePath()) / "mods/multiplayer" / FName, fs::copy_options::overwrite_existing);
-            fs::copy_file(PathToSaveTo, tmp_name, fs::copy_options::overwrite_existing, ec);
-            if (ec) {
-                error(beammp_wide("Error in copy_file during download of ") + beammp_fs_string(PathToSaveTo) + beammp_wide(": ") + Utils::ToWString(ec.message()));
-                break;
-            }
-            fs::rename(tmp_name, name);
             UpdateModUsage(FName);
         }
         WaitForConfirm();
@@ -622,13 +602,7 @@ void SyncResources(SOCKET Sock) {
     if (Ret.starts_with("R")) {
         debug("This server is likely outdated, not trying to parse new mod info format");
     } else {
-        auto ParsedInfo = ModInfo::ParseModInfosFromPacket(Ret);
+        auto [success, modInfo] = ModInfo::ParseModInfosFromPacket(Ret);
-        if (!ParsedInfo.has_value()) {
-            error("Invalid mod info");
-            Terminate = true;
-            return;
-        }
-        auto [success, modInfo] = ParsedInfo.value();
 
         if (success) {
             NewSyncResources(Sock, Ret, modInfo);
@@ -764,12 +738,7 @@ void SyncResources(SOCKET Sock) {
             }
 #endif
 
-            auto name = GetGamePath() / beammp_wide("mods/multiplayer") / Utils::ToWString(FName);
+            fs::copy_file(PathToSaveTo, GetGamePath() / beammp_wide("mods/multiplayer") / Utils::ToWString(FName), fs::copy_options::overwrite_existing);
-            auto tmp_name = name;
-            tmp_name += L".tmp";
-
-            fs::copy_file(PathToSaveTo, tmp_name, fs::copy_options::overwrite_existing);
-            fs::rename(tmp_name, name);
             UpdateModUsage(FN->substr(pos));
         }
         WaitForConfirm();

src/Network/VehicleData.cpp

@@ -7,7 +7,6 @@
 #include "Network/network.hpp"
 #include "Zlib/Compressor.h"
 #include <stdexcept>
-#include <thread>
 
 #if defined(_WIN32)
 #include <ws2tcpip.h>
@@ -22,17 +21,12 @@
 
 #include "Logger.h"
 #include <array>
-#include <future>
-#include <mutex>
 #include <string>
 
 SOCKET UDPSock = -1;
 sockaddr_in* ToServer = nullptr;
 
-std::mutex UDPSendMutex;
-
 void UDPSend(std::string Data) {
-    std::scoped_lock lock(UDPSendMutex);
     if (ClientID == -1 || UDPSock == -1)
         return;
     if (Data.length() > 400) {
@@ -84,7 +78,6 @@ void UDPRcv() {
     Ret[Rcv] = 0;
     UDPParser(std::string_view(Ret.data(), Rcv));
 }
-
 void UDPClientMain(const std::string& IP, int Port) {
 #ifdef _WIN32
     WSADATA data;
@@ -100,16 +93,9 @@ void UDPClientMain(const std::string& IP, int Port) {
     ToServer->sin_port = htons(Port);
     inet_pton(AF_INET, IP.c_str(), &ToServer->sin_addr);
     UDPSock = socket(AF_INET, SOCK_DGRAM, 0);
-    std::future<void> magicSend;
+    if (!magic.empty())
-
+        for (int i = 0; i < 10; i++)
-    if (!magic.empty()) {
+            UDPSend(magic);
-        magicSend = std::async(std::launch::async, ([](){
-            for (int i = 0; i < 10; i++) {
-                UDPSend(magic);
-                std::this_thread::sleep_for(std::chrono::milliseconds(50));
-            }
-        }));
-    }
     GameSend("P" + std::to_string(ClientID));
     TCPSend("H", TCPSock);
     UDPSend("p");
@@ -118,11 +104,6 @@ void UDPClientMain(const std::string& IP, int Port) {
         UDPRcv();
     }
     debug("UDP receive loop done");
-
-    if (magicSend.valid()) {
-        magicSend.get();
-    }
-
     KillSocket(UDPSock);
     WSACleanup();
 }

src/Options.cpp

@@ -92,6 +92,13 @@ void InitOptions(int argc, const char *argv[], Options &options) {
             }
             options.user_path = argv[i + 1];
             i++;
+        } else if (argument == "--region") {
+            if (i + 1 >= argc) {
+                error("You must specify a region after the `--region` argument");
+            }
+            options.region = argv[i + 1];
+            info("Set the region to: " + options.region);
+            i++;
         } else if (argument == "--" || argument == "--game") {
             options.game_arguments = &argv[i + 1];
             options.game_arguments_length = argc - i - 1;

src/Security/Login.cpp

@@ -6,6 +6,8 @@
 
 
 #include "Http.h"
+#include "Options.h"
+#include "RegionHandler.h"
 #include "Logger.h"
 #include <filesystem>
 #include <fstream>

src/Startup.cpp

@@ -24,6 +24,7 @@
 #include "Security/Init.h"
 #include "Startup.h"
 #include "Utils.h"
+#include "RegionHandler.h"
 #include "hashpp.h"
 #include <filesystem>
 #include <fstream>
@@ -86,7 +87,7 @@ std::string GetVer() {
     return "2.8";
 }
 std::string GetPatch() {
-    return ".1";
+    return ".0";
 }
 
 beammp_fs_string GetEP(const beammp_fs_char* P) {
@@ -332,8 +333,7 @@ bool VerifySignature(const std::filesystem::path& filePath)
 
 void CheckForUpdates(const std::string& CV) {
     std::string LatestHash = HTTP::Get("https://backend.beammp.com/sha/launcher?branch=" + Branch + "&pk=" + PublicKey);
-    std::string LatestVersion = HTTP::Get(
+    std::string LatestVersion = HTTP::Get("https://backend.beammp.com/version/launcher?branch=" + Branch + "&pk=" + PublicKey);
-        "https://backend.beammp.com/version/launcher?branch=" + Branch + "&pk=" + PublicKey);
 
     std::regex sha256_pattern(R"(^[a-fA-F0-9]{64}$)");
     std::smatch match;
@@ -357,11 +357,13 @@ void CheckForUpdates(const std::string& CV) {
 #else
             info("Downloading Launcher update " + LatestHash);
             std::wstring DownloadLocation = GetBP() / (beammp_wide("new_") + GetEN());
-            if (HTTP::Download(
+            bool downloadSuccess = false;
+            downloadSuccess = HTTP::Download(
                     "https://backend.beammp.com/builds/launcher?download=true"
                     "&pk="
                         + PublicKey + "&branch=" + Branch,
-                    DownloadLocation, LatestHash)) {
+                DownloadLocation, LatestHash);
+            if (downloadSuccess) {
                 if (!VerifySignature(DownloadLocation) || !CheckThumbprint(DownloadLocation)) {
                     std::error_code ec;
                     fs::remove(DownloadLocation, ec);