9 Commits

Author SHA1 Message Date
SaltySnail
642dc76a92 Remove backend 2026-03-28 22:23:33 +01:00
Tixx
b1c3b978ff Fix include order for winsock2 2026-01-24 20:34:47 +01:00
Lion Kortlepel
7d00d489e4 remove invalid flag 2026-01-24 20:09:37 +01:00
Lion Kortlepel
fd398ed5ab add new header implementation for game<->launcher communication 2026-01-24 20:09:37 +01:00
Lion Kortlepel
b4f0f0759d flush all prints 2026-01-24 20:09:37 +01:00
Lion Kortlepel
5b2bc2d499 print posix_spawn errors 2026-01-24 20:09:26 +01:00
Tixx
fab9ff5559 Provide more info if the launcher update fails (#214)
Also prevents the launcher from bricking itself (again)

---

By creating this pull request, I understand that code that is AI
generated or otherwise automatically generated may be rejected without
further discussion.
I declare that I fully understand all code I pushed into this PR, and
wrote all this code myself and own the rights to this code.
2025-11-22 20:09:15 +01:00
Tixx
a2789a8524 Bump version to v2.7.0 2025-10-20 22:39:36 +02:00
Tixx
3db98eaf0c Provide more info if the launcher update fails
Also prevents the launcher from bricking itself (again)
2025-10-05 15:13:49 +02:00
9 changed files with 283 additions and 273 deletions

View File

@@ -38,6 +38,7 @@ extern std::string MStatus;
extern std::string UlStatus; extern std::string UlStatus;
extern std::string PublicKey; extern std::string PublicKey;
extern std::string PrivateKey; extern std::string PrivateKey;
extern std::string magic;
int KillSocket(uint64_t Dead); int KillSocket(uint64_t Dead);
void UUl(const std::string& R); void UUl(const std::string& R);
void UDPSend(std::string Data); void UDPSend(std::string Data);

View File

@@ -13,9 +13,22 @@
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include <regex> #include <regex>
#include <cstdint>
#include <cstring>
#include <string> #include <string>
#include <variant> #include <variant>
#include <vector> #include <vector>
#include <array>
#include <cerrno>
#include <cstring>
#include <stdexcept>
#if defined(__linux__)
#include <sys/socket.h>
#include "linuxfixes.h"
#else
#include <winsock2.h>
#include <ws2tcpip.h>
#endif
#ifdef _WIN32 #ifdef _WIN32
#define beammp_fs_string std::wstring #define beammp_fs_string std::wstring
@@ -31,6 +44,8 @@
#define beammp_stdout std::cout #define beammp_stdout std::cout
#endif #endif
#include "Logger.h"
namespace Utils { namespace Utils {
inline std::vector<std::string> Split(const std::string& String, const std::string& delimiter) { inline std::vector<std::string> Split(const std::string& String, const std::string& delimiter) {
std::vector<std::string> Val; std::vector<std::string> Val;
@@ -45,7 +60,7 @@ namespace Utils {
if (!s.empty()) if (!s.empty())
Val.push_back(s); Val.push_back(s);
return Val; return Val;
}; }
inline std::string ExpandEnvVars(const std::string& input) { inline std::string ExpandEnvVars(const std::string& input) {
std::string result; std::string result;
std::regex envPattern(R"(%([^%]+)%|\$([A-Za-z_][A-Za-z0-9_]*)|\$\{([^}]+)\})"); std::regex envPattern(R"(%([^%]+)%|\$([A-Za-z_][A-Za-z0-9_]*)|\$\{([^}]+)\})");
@@ -286,4 +301,39 @@ namespace Utils {
return ""; return "";
} }
} }
template<typename T>
inline std::vector<char> PrependHeader(const T& data) {
std::vector<char> size_buffer(4);
uint32_t len = data.size();
std::memcpy(size_buffer.data(), &len, 4);
std::vector<char> buffer;
buffer.reserve(size_buffer.size() + data.size());
buffer.insert(buffer.begin(), size_buffer.begin(), size_buffer.end());
buffer.insert(buffer.end(), data.begin(), data.end());
return buffer;
}
inline uint32_t RecvHeader(SOCKET socket) {
std::array<uint8_t, sizeof(uint32_t)> header_buffer {};
auto n = recv(socket, reinterpret_cast<char*>(header_buffer.data()), header_buffer.size(), MSG_WAITALL);
if (n < 0) {
throw std::runtime_error(std::string("recv() of header failed: ") + std::strerror(errno));
} else if (n == 0) {
throw std::runtime_error("Game disconnected");
}
return *reinterpret_cast<uint32_t*>(header_buffer.data());
}
/// Throws!!!
inline void ReceiveFromGame(SOCKET socket, std::vector<char>& out_data) {
auto header = RecvHeader(socket);
out_data.resize(header);
auto n = recv(socket, reinterpret_cast<char*>(out_data.data()), out_data.size(), MSG_WAITALL);
if (n < 0) {
throw std::runtime_error(std::string("recv() of data failed: ") + std::strerror(errno));
} else if (n == 0) {
throw std::runtime_error("Game disconnected");
}
}
}; };

View File

@@ -4,6 +4,8 @@
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
*/ */
#include <cstring>
#include "Utils.h"
#if defined(_WIN32) #if defined(_WIN32)
#include <shlobj.h> #include <shlobj.h>
#elif defined(__linux__) #elif defined(__linux__)
@@ -18,7 +20,6 @@
#include "Logger.h" #include "Logger.h"
#include "Options.h" #include "Options.h"
#include "Startup.h" #include "Startup.h"
#include "Utils.h"
#include <Security/Init.h> #include <Security/Init.h>
#include <filesystem> #include <filesystem>
#include <thread> #include <thread>
@@ -57,12 +58,11 @@ std::filesystem::path GetGamePath() {
if (ini.contains("filesystem") && std::get<std::map<std::string, std::string>>(ini["filesystem"]).contains("UserPath")) if (ini.contains("filesystem") && std::get<std::map<std::string, std::string>>(ini["filesystem"]).contains("UserPath"))
userPath = Utils::ToWString(std::get<std::map<std::string, std::string>>(ini["filesystem"])["UserPath"]); userPath = Utils::ToWString(std::get<std::map<std::string, std::string>>(ini["filesystem"])["UserPath"]);
if (!userPath.empty() && Path.empty()) if (userPath = Utils::ExpandEnvVars(userPath); std::filesystem::exists(userPath)) {
if (userPath = Utils::ExpandEnvVars(userPath); std::filesystem::exists(userPath)) { Path = userPath;
Path = userPath; debug(L"Using custom user folder path from startup.ini: " + Path.wstring());
debug(L"Using custom user folder path from startup.ini: " + Path.wstring()); } else
} else warn(L"Found custom user folder path (" + userPath + L") in startup.ini but it doesn't exist, skipping");
warn(L"Found custom user folder path (" + userPath + L") in startup.ini but it doesn't exist, skipping");
} }
if (Path.empty()) { if (Path.empty()) {
@@ -94,12 +94,11 @@ std::filesystem::path GetGamePath() {
} }
if (!userPath.empty() && Path.empty()) if (userPath = std::filesystem::path(Utils::ExpandEnvVars(userPath)); std::filesystem::exists(userPath)) {
if (userPath = std::filesystem::path(Utils::ExpandEnvVars(userPath)); std::filesystem::exists(userPath)) { Path = userPath;
Path = userPath; debug(L"Using custom user folder path from BeamNG.Drive.ini: " + Path.wstring());
debug(L"Using custom user folder path from BeamNG.Drive.ini: " + Path.wstring()); } else
} else warn(L"Found custom user folder path (" + userPath + L") in BeamNG.Drive.ini but it doesn't exist, skipping");
warn(L"Found custom user folder path (" + userPath + L") in BeamNG.Drive.ini but it doesn't exist, skipping");
} }
} }
@@ -175,7 +174,6 @@ void StartGame(std::wstring Dir) {
} }
#elif defined(__linux__) #elif defined(__linux__)
void StartGame(std::string Dir) { void StartGame(std::string Dir) {
int status;
std::string filename = (Dir + "/BinLinux/BeamNG.drive.x64"); std::string filename = (Dir + "/BinLinux/BeamNG.drive.x64");
std::vector<const char*> argv; std::vector<const char*> argv;
argv.push_back(filename.data()); argv.push_back(filename.data());
@@ -185,11 +183,24 @@ void StartGame(std::string Dir) {
argv.push_back(nullptr); argv.push_back(nullptr);
pid_t pid; pid_t pid;
posix_spawn_file_actions_t spawn_actions;
posix_spawn_file_actions_init(&spawn_actions); posix_spawn_file_actions_t file_actions;
posix_spawn_file_actions_addclose(&spawn_actions, STDOUT_FILENO); auto status = posix_spawn_file_actions_init(&file_actions);
posix_spawn_file_actions_addclose(&spawn_actions, STDERR_FILENO); // disable stdout
int result = posix_spawn(&pid, filename.c_str(), &spawn_actions, nullptr, const_cast<char**>(argv.data()), environ); if (status != 0) {
error(std::string("posix_spawn_file_actions_init failed: ") + std::strerror(errno));
}
status = posix_spawn_file_actions_addclose(&file_actions, STDOUT_FILENO);
if (status != 0) {
error(std::string("posix_spawn_file_actions_addclose for STDOUT failed: ") + std::strerror(errno));
}
status = posix_spawn_file_actions_addclose(&file_actions, STDERR_FILENO);
if (status != 0) {
error(std::string("posix_spawn_file_actions_addclose for STDERR failed: ") + std::strerror(errno));
}
// launch the game
int result = posix_spawn(&pid, filename.c_str(), &file_actions, NULL, const_cast<char**>(argv.data()), environ);
if (result != 0) { if (result != 0) {
error("Failed to Launch the game! launcher closing soon"); error("Failed to Launch the game! launcher closing soon");

View File

@@ -7,6 +7,7 @@
#include "Http.h" #include "Http.h"
#include "Network/network.hpp" #include "Network/network.hpp"
#include "Security/Init.h" #include "Security/Init.h"
#include "Utils.h"
#include <cstdlib> #include <cstdlib>
#include <regex> #include <regex>
#if defined(_WIN32) #if defined(_WIN32)
@@ -188,7 +189,8 @@ void CoreSend(std::string data) {
std::lock_guard lock(sendMutex); std::lock_guard lock(sendMutex);
if (CoreSocket != -1) { if (CoreSocket != -1) {
int res = send(CoreSocket, (data + "\n").c_str(), int(data.size()) + 1, 0); auto ToSend = Utils::PrependHeader(data);
int res = send(CoreSocket, ToSend.data(), ToSend.size(), 0);
if (res < 0) { if (res < 0) {
debug("(Core) send failed with error: " + std::to_string(WSAGetLastError())); debug("(Core) send failed with error: " + std::to_string(WSAGetLastError()));
} }
@@ -225,7 +227,7 @@ void Parse(std::string Data, SOCKET CSocket) {
TCPTerminate = true; TCPTerminate = true;
Data.clear(); Data.clear();
futures.push_back(std::async(std::launch::async, []() { futures.push_back(std::async(std::launch::async, []() {
CoreSend("B" + HTTP::Get("https://backend.beammp.com/servers-info")); // CoreSend("B" + HTTP::Get("https://backend.beammp.com/servers-info"));
})); }));
} }
break; break;
@@ -278,7 +280,7 @@ void Parse(std::string Data, SOCKET CSocket) {
Ping = "-2"; Ping = "-2";
else else
Ping = std::to_string(ping); Ping = std::to_string(ping);
Data = std::string(UlStatus) + "\n" + "Up" + Ping; Data = "Up" + Ping;
} }
break; break;
case 'M': case 'M':
@@ -348,51 +350,29 @@ void Parse(std::string Data, SOCKET CSocket) {
Data.clear(); Data.clear();
break; break;
} }
if (!Data.empty()) if (!Data.empty() && CSocket != -1) {
CoreSend(Data); auto ToSend = Utils::PrependHeader(Data);
int res = send(CSocket, ToSend.data(), ToSend.size(), 0);
if (res < 0) {
debug("(Core) send failed with error: " + std::to_string(WSAGetLastError()));
}
}
} }
void GameHandler(SOCKET Client) { void GameHandler(SOCKET Client) {
CoreSocket = Client; CoreSocket = Client;
int32_t Size, Rcv; std::vector<char> data{};
int Temp; int Temp;
char Header[10] = { 0 }; char Header[10] = { 0 };
do { do {
Rcv = 0; try {
do { Utils::ReceiveFromGame(Client, data);
Temp = recv(Client, &Header[Rcv], 1, 0); Parse(std::string(data.data(), data.size()), Client);
if (Temp < 1) } catch (const std::exception& e) {
break; error(std::string("Error while receiving from game on core: ") + e.what());
if (!isdigit(Header[Rcv]) && Header[Rcv] != '>') {
error("(Core) Invalid lua communication");
KillSocket(Client);
return;
}
} while (Header[Rcv++] != '>');
if (Temp < 1)
break;
if (std::from_chars(Header, &Header[Rcv], Size).ptr[0] != '>') {
debug("(Core) Invalid lua Header -> " + std::string(Header, Rcv));
break; break;
} }
std::string Ret(Size, 0); } while (true);
Rcv = 0; debug("(Core) Connection closing");
do {
Temp = recv(Client, &Ret[Rcv], Size - Rcv, 0);
if (Temp < 1)
break;
Rcv += Temp;
} while (Rcv < Size);
if (Temp < 1)
break;
Parse(Ret, Client);
} while (Temp > 0);
if (Temp == 0) {
debug("(Core) Connection closing");
} else {
debug("(Core) recv failed with error: " + std::to_string(WSAGetLastError()));
}
NetReset(); NetReset();
KillSocket(Client); KillSocket(Client);
} }

View File

@@ -5,6 +5,7 @@
*/ */
#include "Network/network.hpp" #include "Network/network.hpp"
#include "Utils.h"
#include <memory> #include <memory>
#include <zlib.h> #include <zlib.h>
#if defined(_WIN32) #if defined(_WIN32)
@@ -21,6 +22,7 @@
#endif #endif
#include "Logger.h" #include "Logger.h"
#include "Options.h"
#include <charconv> #include <charconv>
#include <mutex> #include <mutex>
#include <string> #include <string>
@@ -33,6 +35,7 @@ bool GConnected = false;
bool CServer = true; bool CServer = true;
SOCKET CSocket = -1; SOCKET CSocket = -1;
SOCKET GSocket = -1; SOCKET GSocket = -1;
std::string magic;
int KillSocket(uint64_t Dead) { int KillSocket(uint64_t Dead) {
if (Dead == (SOCKET)-1) { if (Dead == (SOCKET)-1) {
@@ -61,30 +64,13 @@ bool CheckBytes(uint32_t Bytes) {
void GameSend(std::string_view Data) { void GameSend(std::string_view Data) {
static std::mutex Lock; static std::mutex Lock;
std::scoped_lock Guard(Lock); std::scoped_lock Guard(Lock);
if (TCPTerminate || !GConnected || CSocket == -1) auto ToSend = Utils::PrependHeader<std::string_view>(Data);
return; auto Result = send(CSocket, ToSend.data(), ToSend.size(), 0);
int32_t Size, Temp, Sent; if (Result < 0) {
Size = int32_t(Data.size()); error("(Game) send failed with error: " + std::to_string(WSAGetLastError()));
Sent = 0;
#ifdef DEBUG
if (Size > 1000) {
debug("Launcher -> game (" + std::to_string(Size) + ")");
}
#endif
do {
if (Sent > -1) {
Temp = send(CSocket, &Data[Sent], Size - Sent, 0);
}
if (!CheckBytes(Temp))
return;
Sent += Temp;
} while (Sent < Size);
// send separately to avoid an allocation for += "\n"
Temp = send(CSocket, "\n", 1, 0);
if (!CheckBytes(Temp)) {
return;
} }
} }
void ServerSend(std::string Data, bool Rel) { void ServerSend(std::string Data, bool Rel) {
if (Terminate || Data.empty()) if (Terminate || Data.empty())
return; return;
@@ -218,6 +204,8 @@ void ParserAsync(std::string_view Data) {
MStatus = Data; MStatus = Data;
UlStatus = "Uldone"; UlStatus = "Uldone";
return; return;
case 'U':
magic = Data.substr(1);
default: default:
break; break;
} }
@@ -265,40 +253,19 @@ void TCPGameServer(const std::string& IP, int Port) {
int32_t Size, Rcv; int32_t Size, Rcv;
int Temp; int Temp;
char Header[10] = { 0 }; char Header[10] = { 0 };
std::vector<char> data {};
// Read byte by byte until '>' is rcved then get the size and read based on it // Read byte by byte until '>' is rcved then get the size and read based on it
do { do {
Rcv = 0; try {
Utils::ReceiveFromGame(CSocket, data);
do { ServerSend(std::string(data.data(), data.size()), false);
Temp = recv(CSocket, &Header[Rcv], 1, 0); } catch (const std::exception& e) {
if (Temp < 1 || TCPTerminate) error(std::string("Error while receiving from game on proxy: ") + e.what());
break;
} while (Header[Rcv++] != '>');
if (Temp < 1 || TCPTerminate)
break;
if (std::from_chars(Header, &Header[Rcv], Size).ptr[0] != '>') {
debug("(Game) Invalid lua Header -> " + std::string(Header, Rcv));
break; break;
} }
std::string Ret(Size, 0); } while (!TCPTerminate);
Rcv = 0; debug("(Proxy) Connection closing");
do {
Temp = recv(CSocket, &Ret[Rcv], Size - Rcv, 0);
if (Temp < 1)
break;
Rcv += Temp;
} while (Rcv < Size && !TCPTerminate);
if (Temp < 1 || TCPTerminate)
break;
ServerSend(Ret, false);
} while (Temp > 0 && !TCPTerminate);
if (Temp == 0)
debug("(Proxy) Connection closing");
else
debug("(Proxy) recv failed error : " + std::to_string(WSAGetLastError()));
} }
TCPTerminate = true; TCPTerminate = true;
GConnected = false; GConnected = false;

View File

@@ -169,118 +169,118 @@ void set_headers(httplib::Response& res) {
} }
void HTTP::StartProxy() { void HTTP::StartProxy() {
std::thread proxy([&]() { // std::thread proxy([&]() {
httplib::Server HTTPProxy; // httplib::Server HTTPProxy;
httplib::Headers headers = { // httplib::Headers headers = {
{ "User-Agent", "BeamMP-Launcher/" + GetVer() + GetPatch() }, // { "User-Agent", "BeamMP-Launcher/" + GetVer() + GetPatch() },
{ "Accept", "*/*" } // { "Accept", "*/*" }
}; // };
httplib::Client backend("https://backend.beammp.com"); // httplib::Client backend("https://backend.beammp.com");
httplib::Client forum("https://forum.beammp.com"); // httplib::Client forum("https://forum.beammp.com");
const std::string pattern = ".*"; // const std::string pattern = ".*";
auto handle_request = [&](const httplib::Request& req, httplib::Response& res) { // auto handle_request = [&](const httplib::Request& req, httplib::Response& res) {
set_headers(res); // set_headers(res);
if (req.has_header("X-BMP-Authentication")) { // if (req.has_header("X-BMP-Authentication")) {
headers.emplace("X-BMP-Authentication", PrivateKey); // headers.emplace("X-BMP-Authentication", PrivateKey);
} // }
if (req.has_header("X-API-Version")) { // if (req.has_header("X-API-Version")) {
headers.emplace("X-API-Version", req.get_header_value("X-API-Version")); // headers.emplace("X-API-Version", req.get_header_value("X-API-Version"));
} // }
const std::vector<std::string> path = Utils::Split(req.path, "/"); // const std::vector<std::string> path = Utils::Split(req.path, "/");
httplib::Result cli_res; // httplib::Result cli_res;
const std::string method = req.method; // const std::string method = req.method;
std::string host = ""; // std::string host = "";
if (!path.empty()) // if (!path.empty())
host = path[0]; // host = path[0];
if (host == "backend") { // if (host == "backend") {
std::string remaining_path = req.path.substr(std::strlen("/backend")); // std::string remaining_path = req.path.substr(std::strlen("/backend"));
if (method == "GET") // if (method == "GET")
cli_res = backend.Get(remaining_path, headers); // cli_res = backend.Get(remaining_path, headers);
else if (method == "POST") // else if (method == "POST")
cli_res = backend.Post(remaining_path, headers); // cli_res = backend.Post(remaining_path, headers);
} else if (host == "avatar") { // } else if (host == "avatar") {
bool error = false; // bool error = false;
std::string username; // std::string username;
std::string avatar_size = "100"; // std::string avatar_size = "100";
if (path.size() > 1) { // if (path.size() > 1) {
username = path[1]; // username = path[1];
} else { // } else {
error = true; // error = true;
} // }
if (path.size() > 2) { // if (path.size() > 2) {
try { // try {
if (std::stoi(path[2]) > 0) // if (std::stoi(path[2]) > 0)
avatar_size = path[2]; // avatar_size = path[2];
} catch (std::exception&) { } // } catch (std::exception&) { }
} // }
httplib::Result summary_res; // httplib::Result summary_res;
if (!error) { // if (!error) {
summary_res = forum.Get("/u/" + username + ".json", headers); // summary_res = forum.Get("/u/" + username + ".json", headers);
if (!summary_res || summary_res->status != 200) { // if (!summary_res || summary_res->status != 200) {
error = true; // error = true;
} // }
} // }
if (!error) { // if (!error) {
try { // try {
nlohmann::json d = nlohmann::json::parse(summary_res->body, nullptr, false); // can fail with parse_error // nlohmann::json d = nlohmann::json::parse(summary_res->body, nullptr, false); // can fail with parse_error
auto user = d.at("user"); // can fail with out_of_range // auto user = d.at("user"); // can fail with out_of_range
auto avatar_link_json = user.at("avatar_template"); // can fail with out_of_range // auto avatar_link_json = user.at("avatar_template"); // can fail with out_of_range
auto avatar_link = avatar_link_json.get<std::string>(); // auto avatar_link = avatar_link_json.get<std::string>();
size_t start_pos = avatar_link.find("{size}"); // size_t start_pos = avatar_link.find("{size}");
if (start_pos != std::string::npos) // if (start_pos != std::string::npos)
avatar_link.replace(start_pos, std::strlen("{size}"), avatar_size); // avatar_link.replace(start_pos, std::strlen("{size}"), avatar_size);
cli_res = forum.Get(avatar_link, headers); // cli_res = forum.Get(avatar_link, headers);
} catch (std::exception&) { // } catch (std::exception&) {
error = true; // error = true;
} // }
} // }
if (error) { // if (error) {
cli_res = forum.Get("/user_avatar/forum.beammp.com/user/0/0.png", headers); // cli_res = forum.Get("/user_avatar/forum.beammp.com/user/0/0.png", headers);
} // }
} else { // } else {
res.set_content("Host not found", "text/plain"); // res.set_content("Host not found", "text/plain");
return; // return;
} // }
if (cli_res) { // if (cli_res) {
res.set_content(cli_res->body, cli_res->get_header_value("Content-Type")); // res.set_content(cli_res->body, cli_res->get_header_value("Content-Type"));
} else { // } else {
res.set_content(to_string(cli_res.error()), "text/plain"); // res.set_content(to_string(cli_res.error()), "text/plain");
} // }
}; // };
HTTPProxy.Get(pattern, [&](const httplib::Request& req, httplib::Response& res) { // HTTPProxy.Get(pattern, [&](const httplib::Request& req, httplib::Response& res) {
handle_request(req, res); // handle_request(req, res);
}); // });
HTTPProxy.Post(pattern, [&](const httplib::Request& req, httplib::Response& res) { // HTTPProxy.Post(pattern, [&](const httplib::Request& req, httplib::Response& res) {
handle_request(req, res); // handle_request(req, res);
}); // });
ProxyPort = HTTPProxy.bind_to_any_port("127.0.0.1"); // ProxyPort = HTTPProxy.bind_to_any_port("127.0.0.1");
debug("HTTP Proxy listening on port " + std::to_string(ProxyPort)); // debug("HTTP Proxy listening on port " + std::to_string(ProxyPort));
HTTPProxy.listen_after_bind(); // HTTPProxy.listen_after_bind();
}); // });
proxy.detach(); // proxy.detach();
} }

View File

@@ -93,6 +93,8 @@ void UDPClientMain(const std::string& IP, int Port) {
ToServer->sin_port = htons(Port); ToServer->sin_port = htons(Port);
inet_pton(AF_INET, IP.c_str(), &ToServer->sin_addr); inet_pton(AF_INET, IP.c_str(), &ToServer->sin_addr);
UDPSock = socket(AF_INET, SOCK_DGRAM, 0); UDPSock = socket(AF_INET, SOCK_DGRAM, 0);
if (!magic.empty())
UDPSend(magic);
GameSend("P" + std::to_string(ClientID)); GameSend("P" + std::to_string(ClientID));
TCPSend("H", TCPSock); TCPSend("H", TCPSock);
UDPSend("p"); UDPSend("p");

View File

@@ -6,6 +6,7 @@
#include <filesystem> #include <filesystem>
#include "Utils.h"
#if defined(_WIN32) #if defined(_WIN32)
#include <shlobj_core.h> #include <shlobj_core.h>
#elif defined(__linux__) #elif defined(__linux__)
@@ -15,8 +16,6 @@
#include <vector> #include <vector>
#endif #endif
#include "Logger.h" #include "Logger.h"
#include "Utils.h"
#include <fstream> #include <fstream>
#include <string> #include <string>
#include <thread> #include <thread>

View File

@@ -84,10 +84,10 @@ beammp_fs_string GetEN() {
} }
std::string GetVer() { std::string GetVer() {
return "2.6"; return "2.7";
} }
std::string GetPatch() { std::string GetPatch() {
return ".4"; return ".0";
} }
beammp_fs_string GetEP(const beammp_fs_char* P) { beammp_fs_string GetEP(const beammp_fs_char* P) {
@@ -195,44 +195,44 @@ void CheckName() {
} }
void CheckForUpdates(const std::string& CV) { 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.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);
transform(LatestHash.begin(), LatestHash.end(), LatestHash.begin(), ::tolower); // transform(LatestHash.begin(), LatestHash.end(), LatestHash.begin(), ::tolower);
beammp_fs_string BP(GetBP() / GetEN()), Back(GetBP() / beammp_wide("BeamMP-Launcher.back")); // beammp_fs_string BP(GetBP() / GetEN()), Back(GetBP() / beammp_wide("BeamMP-Launcher.back"));
std::string FileHash = Utils::GetSha256HashReallyFastFile(BP); // std::string FileHash = Utils::GetSha256HashReallyFastFile(BP);
if (FileHash != LatestHash && IsOutdated(Version(VersionStrToInts(GetVer() + GetPatch())), Version(VersionStrToInts(LatestVersion)))) { // if (FileHash != LatestHash && IsOutdated(Version(VersionStrToInts(GetVer() + GetPatch())), Version(VersionStrToInts(LatestVersion)))) {
if (!options.no_update) { // if (!options.no_update) {
info("Launcher update " + LatestVersion + " found!"); // info("Launcher update " + LatestVersion + " found!");
#if defined(__linux__) // #if defined(__linux__)
error("Auto update is NOT implemented for the Linux version. Please update manually ASAP as updates contain security patches."); // error("Auto update is NOT implemented for the Linux version. Please update manually ASAP as updates contain security patches.");
#else // #else
info("Downloading Launcher update " + LatestHash); // info("Downloading Launcher update " + LatestHash);
HTTP::Download( // HTTP::Download(
"https://backend.beammp.com/builds/launcher?download=true" // "https://backend.beammp.com/builds/launcher?download=true"
"&pk=" // "&pk="
+ PublicKey + "&branch=" + Branch, // + PublicKey + "&branch=" + Branch,
GetBP() / (beammp_wide("new_") + GetEN()), LatestHash); // GetBP() / (beammp_wide("new_") + GetEN()), LatestHash);
std::error_code ec; // std::error_code ec;
fs::remove(Back, ec); // fs::remove(Back, ec);
if (ec == std::errc::permission_denied) { // if (ec == std::errc::permission_denied) {
error("Failed to remove old backup file: " + ec.message() + ". Using alternative name."); // error("Failed to remove old backup file: " + ec.message() + ". Using alternative name.");
fs::rename(BP, Back + beammp_wide(".") + Utils::ToWString(FileHash.substr(0, 8))); // fs::rename(BP, Back + beammp_wide(".") + Utils::ToWString(FileHash.substr(0, 8)));
} else { // } else {
fs::rename(BP, Back); // fs::rename(BP, Back);
} // }
fs::rename(GetBP() / (beammp_wide("new_") + GetEN()), BP); // fs::rename(GetBP() / (beammp_wide("new_") + GetEN()), BP);
URelaunch(); // URelaunch();
#endif // #endif
} else { // } else {
warn("Launcher update was found, but not updating because --no-update or --dev was specified."); // warn("Launcher update was found, but not updating because --no-update or --dev was specified.");
} // }
} else // } else
info("Launcher version is up to date. Latest version: " + LatestVersion); // info("Launcher version is up to date. Latest version: " + LatestVersion);
TraceBack++; // TraceBack++;
} }
@@ -347,42 +347,42 @@ void PreGame(const beammp_fs_string& GamePath) {
CheckMP(GetGamePath() / beammp_wide("mods/multiplayer")); CheckMP(GetGamePath() / beammp_wide("mods/multiplayer"));
info(beammp_wide("Game user path: ") + beammp_fs_string(GetGamePath())); info(beammp_wide("Game user path: ") + beammp_fs_string(GetGamePath()));
if (!options.no_download) { // 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.beammp.com/sha/mod?branch=" + Branch + "&pk=" + PublicKey);
transform(LatestHash.begin(), LatestHash.end(), LatestHash.begin(), ::tolower); // transform(LatestHash.begin(), LatestHash.end(), LatestHash.begin(), ::tolower);
LatestHash.erase(std::remove_if(LatestHash.begin(), LatestHash.end(), // LatestHash.erase(std::remove_if(LatestHash.begin(), LatestHash.end(),
[](auto const& c) -> bool { return !std::isalnum(c); }), // [](auto const& c) -> bool { return !std::isalnum(c); }),
LatestHash.end()); // LatestHash.end());
try { // try {
if (!fs::exists(GetGamePath() / beammp_wide("mods/multiplayer"))) { // if (!fs::exists(GetGamePath() / beammp_wide("mods/multiplayer"))) {
fs::create_directories(GetGamePath() / beammp_wide("mods/multiplayer")); // fs::create_directories(GetGamePath() / beammp_wide("mods/multiplayer"));
} // }
EnableMP(); // EnableMP();
} catch (std::exception& e) { // } catch (std::exception& e) {
fatal(e.what()); // fatal(e.what());
} // }
#if defined(_WIN32) // #if defined(_WIN32)
std::wstring ZipPath(GetGamePath() / LR"(mods\multiplayer\BeamMP.zip)"); // std::wstring ZipPath(GetGamePath() / LR"(mods\multiplayer\BeamMP.zip)");
#elif defined(__linux__) // #elif defined(__linux__)
// Linux version of the game cant handle mods with uppercase names // // Linux version of the game cant handle mods with uppercase names
std::string ZipPath(GetGamePath() / R"(mods/multiplayer/beammp.zip)"); // std::string ZipPath(GetGamePath() / R"(mods/multiplayer/beammp.zip)");
#endif // #endif
std::string FileHash = fs::exists(ZipPath) ? Utils::GetSha256HashReallyFastFile(ZipPath) : ""; // std::string FileHash = fs::exists(ZipPath) ? Utils::GetSha256HashReallyFastFile(ZipPath) : "";
if (FileHash != LatestHash) { // if (FileHash != LatestHash) {
info("Downloading BeamMP Update " + LatestHash); // info("Downloading BeamMP Update " + LatestHash);
HTTP::Download("https://backend.beammp.com/builds/client?download=true" // HTTP::Download("https://backend.beammp.com/builds/client?download=true"
"&pk=" // "&pk="
+ PublicKey + "&branch=" + Branch, // + PublicKey + "&branch=" + Branch,
ZipPath, LatestHash); // ZipPath, LatestHash);
} // }
beammp_fs_string Target(GetGamePath() / beammp_wide("mods/unpacked/beammp")); // beammp_fs_string Target(GetGamePath() / beammp_wide("mods/unpacked/beammp"));
if (fs::is_directory(Target) && !fs::is_directory(Target + beammp_wide("/.git"))) { // if (fs::is_directory(Target) && !fs::is_directory(Target + beammp_wide("/.git"))) {
fs::remove_all(Target); // fs::remove_all(Target);
} // }
} // }
} }