Fix download size int casting

include/Network/network.hpp

@@ -42,7 +42,7 @@ extern std::string magic;
 int KillSocket(uint64_t Dead);
 void UUl(const std::string& R);
 void UDPSend(std::string Data);
-bool CheckBytes(int32_t Bytes, int32_t Expected = -1);
+bool CheckBytes(int32_t Bytes);
 void GameSend(std::string_view Data);
 void SendLarge(std::string Data);
 std::string TCPRcv(uint64_t Sock);
@@ -56,4 +56,3 @@ void UDPClientMain(const std::string& IP, int Port);
 void TCPGameServer(const std::string& IP, int Port);
 bool SecurityWarning();
 void CoreSend(std::string data);
-int RecvWaitAll(int sockfd, char *buf, int len);

include/Options.h

@@ -20,7 +20,6 @@ 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;

include/Utils.h

@@ -336,14 +336,4 @@ namespace Utils {
             throw std::runtime_error("Game disconnected");
         }
     }
-
-    inline std::string RegionToTopLevelDomain(const std::string region) {
-        if (region == "Restricted") {
-            return "beammp.ru";
-        }
-        else if (region == "Developer") {
-            return "beammp.dev";
-        }
-        return "beammp.com"; // Global
-    }
 };

src/Config.cpp

@@ -36,10 +36,6 @@ void ParseConfig(const nlohmann::json& d) {
         CachingDirectory = std::filesystem::path(d["CachingDirectory"].get<std::string>());
         info(beammp_wide("Mod caching directory: ") + beammp_fs_string(CachingDirectory.relative_path()));
     }
-    if (d.contains("Region") && d["Region"].is_string()) {
-        options.region = d["Region"].get<std::string>();
-        info("Set the region to: " + options.region);
-    }
 
     if (d.contains("Dev") && d["Dev"].is_boolean()) {
         bool dev = d["Dev"].get<bool>();
@@ -71,18 +67,14 @@ void ConfigInit() {
         } else
             fatal("Failed to open Launcher.cfg!");
     } else {
-        if (options.region.empty())
-        {
-            options.region = "Global";
-        }
         std::ofstream cfg("Launcher.cfg");
         if (cfg.is_open()) {
             cfg <<
                 R"({
     "Port": 4444,
     "Build": "Default",
-    "CachingDirectory": "./Resources",
-    "Region": ")" << options.region << "\"\n}";
+    "CachingDirectory": "./Resources"
+})";
             cfg.close();
         } else {
             fatal("Failed to write config on disk!");

src/Network/Core.cpp

@@ -143,28 +143,29 @@ void GetServerInfo(std::string Data) {
     const std::string buffer = ([&]() -> std::string {
         int32_t Header;
         std::vector<char> data(sizeof(Header));
-        int Temp = RecvWaitAll(ISock, data.data(), sizeof(Header));
+        int Temp = recv(ISock, data.data(), sizeof(Header), MSG_WAITALL);
 
-        auto checkBytes = ([&](const int32_t bytes, const int32_t expected = -1) -> bool {
+        auto checkBytes = ([&](const int32_t bytes) -> bool {
             if (bytes == 0) {
                 return false;
             } else if (bytes < 0) {
                 return false;
             }
-            if (expected != -1 && bytes != expected) {
-                return false;
-            }
             return true;
         });
 
-        if (!checkBytes(Temp, sizeof(Header))) {
+        if (!checkBytes(Temp)) {
             return "";
         }
         memcpy(&Header, data.data(), sizeof(Header));
 
+        if (!checkBytes(Temp)) {
+            return "";
+        }
+
         data.resize(Header, 0);
-        Temp = RecvWaitAll(ISock, data.data(), Header);
-        if (!checkBytes(Temp, Header)) {
+        Temp = recv(ISock, data.data(), Header, MSG_WAITALL);
+        if (!checkBytes(Temp)) {
             return "";
         }
         return std::string(data.data(), Header);
@@ -226,7 +227,7 @@ 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." + Utils::RegionToTopLevelDomain(options.region) + "/servers-info"));
+                CoreSend("B" + HTTP::Get("https://backend.beammp.com/servers-info"));
             }));
         }
         break;

src/Network/GlobalHandler.cpp

@@ -50,6 +50,17 @@ int KillSocket(uint64_t Dead) {
     return a;
 }
 
+bool CheckBytes(uint32_t Bytes) {
+    if (Bytes == 0) {
+        debug("(Proxy) Connection closing");
+        return false;
+    } else if (Bytes < 0) {
+        debug("(Proxy) send failed with error: " + std::to_string(WSAGetLastError()));
+        return false;
+    }
+    return true;
+}
+
 void GameSend(std::string_view Data) {
     static std::mutex Lock;
     std::scoped_lock Guard(Lock);
@@ -195,6 +206,7 @@ void ParserAsync(std::string_view Data) {
         return;
     case 'U':
         magic = Data.substr(1);
+        return;
     default:
         break;
     }

src/Network/Http.cpp

@@ -6,7 +6,6 @@
 
 
 #include "Http.h"
-#include "Options.h"
 #include <Logger.h>
 #include <Network/network.hpp>
 #include <Startup.h>
@@ -137,8 +136,8 @@ void HTTP::StartProxy() {
             { "User-Agent", "BeamMP-Launcher/" + GetVer() + GetPatch() },
             { "Accept", "*/*" }
         };
-        httplib::Client backend("https://backend." + Utils::RegionToTopLevelDomain(options.region));
-        httplib::Client forum("https://forum." + Utils::RegionToTopLevelDomain(options.region));
+        httplib::Client backend("https://backend.beammp.com");
+        httplib::Client forum("https://forum.beammp.com");
 
         const std::string pattern = ".*";
 
@@ -217,7 +216,7 @@ void HTTP::StartProxy() {
                 }
 
                 if (error) {
-                    cli_res = forum.Get("/user_avatar/forum." + Utils::RegionToTopLevelDomain(options.region) + "/user/0/0.png", headers);
+                    cli_res = forum.Get("/user_avatar/forum.beammp.com/user/0/0.png", headers);
                 }
 
             } else {

src/Network/Resources.cpp

@@ -163,8 +163,12 @@ std::vector<char> TCPRcvRaw(SOCKET Sock, uint64_t& GRcv, uint64_t Size) {
     int i = 0;
     do {
         // receive at most some MB at a time
-        int Len = std::min(int(Size - Rcv), 1 * 1024 * 1024);
-        int Temp = RecvWaitAll(Sock, &File[Rcv], Len);
+        uint64_t Len = std::min<uint64_t>((Size - Rcv), 1 * 1024 * 1024);
+        if (Len == 0) {
+            error("Download size miscalculation");
+            break;
+        }
+        int Temp = recv(Sock, &File[Rcv], Len, MSG_WAITALL);
         if (Temp == -1 || Temp == 0) {
             debug("Recv returned: " + std::to_string(Temp));
             if (Temp == -1) {
@@ -579,7 +583,12 @@ void NewSyncResources(SOCKET Sock, const std::string& Mods, const std::vector<Mo
             }
 #endif
 
-            fs::copy_file(PathToSaveTo, std::filesystem::path(GetGamePath()) / "mods/multiplayer" / FName, fs::copy_options::overwrite_existing);
+            std::error_code ec;
+            fs::copy_file(PathToSaveTo, std::filesystem::path(GetGamePath()) / "mods/multiplayer" / FName, 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;
+            }
             UpdateModUsage(FName);
         }
         WaitForConfirm();

src/Network/VehicleEvent.cpp

@@ -28,9 +28,9 @@ int LastPort;
 std::string LastIP;
 SOCKET TCPSock = -1;
 
-bool CheckBytes(int32_t Bytes, int32_t Expected) {
+bool CheckBytes(int32_t Bytes) {
     if (Bytes == 0) {
-        debug("(TCP) Connection closing...");
+        debug("(TCP) Connection closing... CheckBytes(16)");
         Terminate = true;
         return false;
     } else if (Bytes < 0) {
@@ -39,11 +39,6 @@ bool CheckBytes(int32_t Bytes, int32_t Expected) {
         Terminate = true;
         return false;
     }
-    if (Expected != -1 && Bytes != Expected) {
-        debug(std::format("(TCP) Short recv detected, expected {} bytes, got {} bytes", Expected, Bytes));
-        Terminate = true;
-        return false;
-    }
     return true;
 }
 void UUl(const std::string& R) {
@@ -80,24 +75,6 @@ void TCPSend(const std::string& Data, uint64_t Sock) {
     } while (Sent < Size);
 }
 
-int RecvWaitAll(int sockfd, char *buf, int len) {
-    // handle MSG_WAITALL not actually filling the whole buffer
-    // happens frequently in wine, and can also happen natively when the OS pauses the execution for various reasons
-    int offset = 0;
-    while (offset < len) {
-        int recv_status = recv(sockfd, &buf[offset], len - offset, MSG_WAITALL);
-        if (recv_status == 0) {
-            // do not discard received data when the other side closes the socket cleanly
-            return offset;
-        }
-        if (recv_status == -1) {
-            return -1;
-        }
-        offset += recv_status;
-    }
-    return offset;
-}
-
 std::string TCPRcv(SOCKET Sock) {
     if (Sock == -1) {
         Terminate = true;
@@ -107,8 +84,8 @@ std::string TCPRcv(SOCKET Sock) {
     int32_t Header;
     int Temp;
     std::vector<char> Data(sizeof(Header));
-    Temp = RecvWaitAll(Sock, Data.data(), sizeof(Header));
-    if (!CheckBytes(Temp, sizeof(Header))) {
+    Temp = recv(Sock, Data.data(), sizeof(Header), MSG_WAITALL);
+    if (!CheckBytes(Temp)) {
         UUl("Socket Closed Code 3");
         return "";
     }
@@ -120,8 +97,8 @@ std::string TCPRcv(SOCKET Sock) {
     }
 
     Data.resize(Header, 0);
-    Temp = RecvWaitAll(Sock, Data.data(), Header);
-    if (!CheckBytes(Temp, Header)) {
+    Temp = recv(Sock, Data.data(), Header, MSG_WAITALL);
+    if (!CheckBytes(Temp)) {
         UUl("Socket Closed Code 5");
         return "";
     }

src/Options.cpp

@@ -92,13 +92,6 @@ 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;
@@ -115,7 +108,6 @@ void InitOptions(int argc, const char *argv[], Options &options) {
                 "\t--no-launch          Skip launching the game (you must launch the game manually)\n"
                 "\t--dev                Developer mode, same as --verbose --no-download --no-launch --no-update\n"
                 "\t--user-path <path>   Path to BeamNG's User Path\n"
-                "\t--region <region>    Sets a custom region, options are 'Global', and 'Restricted'\n"
                 "\t--game <args...>     Passes ALL following arguments to the game, see also `--`\n"
                 << std::flush;
             exit(0);

src/Security/Login.cpp

@@ -6,7 +6,6 @@
 
 
 #include "Http.h"
-#include "Options.h"
 #include "Logger.h"
 #include <filesystem>
 #include <fstream>
@@ -56,7 +55,7 @@ std::string Login(const std::string& fields) {
     }
     info("Attempting to authenticate...");
     try {
-        std::string Buffer = HTTP::Post("https://auth." + Utils::RegionToTopLevelDomain(options.region) + "/userlogin", fields);
+        std::string Buffer = HTTP::Post("https://auth.beammp.com/userlogin", fields);
 
         if (Buffer.empty()) {
             return GetFail("Failed to communicate with the auth system!");
@@ -116,7 +115,7 @@ void CheckLocalKey() {
                 }
             }
 
-            Buffer = HTTP::Post("https://auth." + Utils::RegionToTopLevelDomain(options.region) + "/userlogin", R"({"pk":")" + Buffer + "\"}");
+            Buffer = HTTP::Post("https://auth.beammp.com/userlogin", R"({"pk":")" + Buffer + "\"}");
 
             nlohmann::json d = nlohmann::json::parse(Buffer, nullptr, false);
 

src/Startup.cpp

@@ -331,9 +331,9 @@ bool VerifySignature(const std::filesystem::path& filePath)
 #endif
 
 void CheckForUpdates(const std::string& CV) {
-    std::string LatestHash = HTTP::Get("https://backend." + Utils::RegionToTopLevelDomain(options.region) + "/sha/launcher?branch=" + Branch + "&pk=" + PublicKey);
+    std::string LatestHash = HTTP::Get("https://backend.beammp.com/sha/launcher?branch=" + Branch + "&pk=" + PublicKey);
     std::string LatestVersion = HTTP::Get(
-        "https://backend." + Utils::RegionToTopLevelDomain(options.region) + "/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;
@@ -358,7 +358,7 @@ void CheckForUpdates(const std::string& CV) {
             info("Downloading Launcher update " + LatestHash);
             std::wstring DownloadLocation = GetBP() / (beammp_wide("new_") + GetEN());
             if (HTTP::Download(
-                    "https://backend." + Utils::RegionToTopLevelDomain(options.region) + "/builds/launcher?download=true"
+                    "https://backend.beammp.com/builds/launcher?download=true"
                     "&pk="
                         + PublicKey + "&branch=" + Branch,
                     DownloadLocation, LatestHash)) {
@@ -514,7 +514,7 @@ void PreGame(const beammp_fs_string& GamePath) {
     info(beammp_wide("Game user path: ") + beammp_fs_string(GetGamePath()));
 
     if (!options.no_download) {
-        std::string LatestHash = HTTP::Get("https://backend." + Utils::RegionToTopLevelDomain(options.region) + "/sha/mod?branch=" + Branch + "&pk=" + PublicKey);
+        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); }),
@@ -548,7 +548,7 @@ void PreGame(const beammp_fs_string& GamePath) {
 
         if (FileHash != LatestHash) {
             info("Downloading BeamMP Update " + LatestHash);
-            HTTP::Download("https://backend." + Utils::RegionToTopLevelDomain(options.region) + "/builds/client?download=true"
+            HTTP::Download("https://backend.beammp.com/builds/client?download=true"
                            "&pk="
                     + PublicKey + "&branch=" + Branch,
                 ZipPath, LatestHash);