Add region tld

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;

include/Utils.h

@@ -336,4 +336,14 @@ 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,6 +36,10 @@ 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>();
@@ -67,14 +71,18 @@ 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"
+    "CachingDirectory": "./Resources",
-})";
+    "Region": ")" << options.region << "\"\n}";
             cfg.close();
         } else {
             fatal("Failed to write config on disk!");

src/Network/Core.cpp

@@ -226,7 +226,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.beammp.com/servers-info"));
+                CoreSend("B" + HTTP::Get("https://backend." + Utils::RegionToTopLevelDomain(options.region) + "/servers-info"));
             }));
         }
         break;

src/Network/Http.cpp

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

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;
@@ -108,6 +115,7 @@ 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,6 +6,7 @@
 
 
 #include "Http.h"
+#include "Options.h"
 #include "Logger.h"
 #include <filesystem>
 #include <fstream>
@@ -55,7 +56,7 @@ std::string Login(const std::string& fields) {
     }
     info("Attempting to authenticate...");
     try {
-        std::string Buffer = HTTP::Post("https://auth.beammp.com/userlogin", fields);
+        std::string Buffer = HTTP::Post("https://auth." + Utils::RegionToTopLevelDomain(options.region) + "/userlogin", fields);
 
         if (Buffer.empty()) {
             return GetFail("Failed to communicate with the auth system!");
@@ -115,7 +116,7 @@ void CheckLocalKey() {
                 }
             }
 
-            Buffer = HTTP::Post("https://auth.beammp.com/userlogin", R"({"pk":")" + Buffer + "\"}");
+            Buffer = HTTP::Post("https://auth." + Utils::RegionToTopLevelDomain(options.region) + "/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.beammp.com/sha/launcher?branch=" + Branch + "&pk=" + PublicKey);
+    std::string LatestHash = HTTP::Get("https://backend." + Utils::RegionToTopLevelDomain(options.region) + "/sha/launcher?branch=" + Branch + "&pk=" + PublicKey);
     std::string LatestVersion = HTTP::Get(
-        "https://backend.beammp.com/version/launcher?branch=" + Branch + "&pk=" + PublicKey);
+        "https://backend." + Utils::RegionToTopLevelDomain(options.region) + "/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.beammp.com/builds/launcher?download=true"
+                    "https://backend." + Utils::RegionToTopLevelDomain(options.region) + "/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.beammp.com/sha/mod?branch=" + Branch + "&pk=" + PublicKey);
+        std::string LatestHash = HTTP::Get("https://backend." + Utils::RegionToTopLevelDomain(options.region) + "/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.beammp.com/builds/client?download=true"
+            HTTP::Download("https://backend." + Utils::RegionToTopLevelDomain(options.region) + "/builds/client?download=true"
                            "&pk="
                     + PublicKey + "&branch=" + Branch,
                 ZipPath, LatestHash);