BeamMP/BeamMP-Launcher
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Launcher.git synced 2025-07-01 23:46:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

add command-line options

Browse Source
This commit is contained in:
Tixx 2024-09-22 22:02:36 +02:00
parent 768f11f6ec
commit aca61886d0
11 changed files with 123 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/Network/network.hpp
View File

@ -26,7 +26,6 @@ extern int ClientID;
extern int LastPort;
extern bool ModLoaded;
extern bool Terminate;
extern int DEFAULT_PORT;
extern uint64_t UDPSock;
extern uint64_t TCPSock;
extern std::string Branch;

17
include/Options.h Normal file
View File

@ -0,0 +1,17 @@
#pragma once
#include <string>
struct Options {
std::string executable_name = "BeamMP-Launcher.exe";
unsigned int port = 4444;
bool verbose = false;
bool no_download = false;
bool no_launch = false;
char **game_arguments = nullptr;
int game_arguments_length = 0;
};
void InitOptions(int argc, char *argv[], Options &options);
extern Options options;

3
include/Startup.h
View File

@ -10,12 +10,11 @@
#include <string>
#include <vector>
void InitLauncher(int argc, char* argv[]);
void InitLauncher();
std::string GetEP(char* P = nullptr);
std::string GetGamePath();
std::string GetVer();
std::string GetPatch();
std::string GetEN();
void ConfigInit();
extern bool Dev;

3
src/Config.cpp
View File

@ -8,6 +8,7 @@
#include <filesystem>
#include <fstream>
#include <nlohmann/json.hpp>
#include "Options.h"
namespace fs = std::filesystem;
std::string Branch;
@ -15,7 +16,7 @@ std::string CachingDirectory = "./Resources";
void ParseConfig(const nlohmann::json& d) {
if (d["Port"].is_number()) {
DEFAULT_PORT = d["Port"].get<int>();
options.port = d["Port"].get<int>();
}
// Default -1
// Release 1

3
src/GameStart.cpp
View File

@ -23,6 +23,7 @@
#include <Security/Init.h>
#include <filesystem>
#include <thread>
#include "Options.h"
unsigned long GamePID = 0;
#if defined(_WIN32)
@ -121,7 +122,7 @@ void StartGame(std::string Dir) {
#endif
void InitGame(const std::string& Dir) {
if (!Dev) {
if (!options.no_launch) {
std::thread Game(StartGame, Dir);
Game.detach();
}

3
src/Logger.cpp
View File

@ -12,6 +12,7 @@
#include <fstream>
#include <sstream>
#include <thread>
#include "Options.h"
std::string getDate() {
time_t tt = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
@ -54,6 +55,8 @@ void info(const std::string& toPrint) {
addToLog(Print);
}
void debug(const std::string& toPrint) {
if (!options.verbose)
return;
std::string Print = getDate() + "[DEBUG] " + toPrint + "\n";
if (Dev) {
std::cout << Print;

4
src/Network/Core.cpp
View File

@ -30,11 +30,11 @@
#include <nlohmann/json.hpp>
#include <set>
#include <thread>
#include "Options.h"
extern int TraceBack;
std::set<std::string>* ConfList = nullptr;
bool TCPTerminate = false;
int DEFAULT_PORT = 4444;
bool Terminate = false;
bool LoginAuth = false;
std::string Username = "";
@ -306,7 +306,7 @@ void CoreMain() {
hints.ai_socktype = SOCK_STREAM;
hints.ai_protocol = IPPROTO_TCP;
hints.ai_flags = AI_PASSIVE;
iRes = getaddrinfo(nullptr, std::to_string(DEFAULT_PORT).c_str(), &hints, &res);
iRes = getaddrinfo(nullptr, std::to_string(options.port).c_str(), &hints, &res);
if (iRes) {
debug("(Core) addr info failed with error: " + std::to_string(iRes));
WSACleanup();

3
src/Network/GlobalHandler.cpp
View File

@ -26,6 +26,7 @@
#include <mutex>
#include <string>
#include <thread>
#include "Options.h"
std::chrono::time_point<std::chrono::high_resolution_clock> PingStart, PingEnd;
bool GConnected = false;
@ -161,7 +162,7 @@ SOCKET SetupListener() {
hints.ai_socktype = SOCK_STREAM;
hints.ai_protocol = IPPROTO_TCP;
hints.ai_flags = AI_PASSIVE;
iRes = getaddrinfo(nullptr, std::to_string(DEFAULT_PORT + 1).c_str(), &hints, &result);
iRes = getaddrinfo(nullptr, std::to_string(options.port + 1).c_str(), &hints, &result);
if (iRes != 0) {
error("(Proxy) info failed with error: " + std::to_string(iRes));
WSACleanup();

57
src/Options.cpp Normal file
View File

@ -0,0 +1,57 @@
#include "Options.h"
#include "Logger.h"
#include <cstdlib>
void InitOptions(int argc, char *argv[], Options &options) {
int i = 1;
options.executable_name = std::string(argv[0]);
while (i < argc) {
std::string argument(argv[i]);
if (argument == "-p" || argument == "--port") {
if (argc > i + 1) {
std::string error_message =
"No port specified, resorting to default (";
error_message += options.port;
error_message += ")";
error(error_message);
continue;
}
int port = atoi(argv[i + 1]);
if (port <= 0) {
std::string error_message =
"Port invalid, must be a non-zero positive "
"integer, resorting to default (";
error_message += options.port;
error_message += ")";
error(error_message);
continue;
}
options.port = port;
i++;
} else if (argument == "-v" || argument == "--verbose") {
options.verbose = true;
} else if (argument == "--no-download") {
options.no_download = true;
} else if (argument == "--no-launch") {
options.no_launch = true;
} else if (argument == "--dev") {
options.verbose = true;
options.no_download = true;
options.no_launch = true;
} else if (argument == "--") {
options.game_arguments = &argv[i + 1];
options.game_arguments_length = argc - i - 1;
break;
} else {
warn("Unknown option: " + argument);
}
i++;
}
}

75
src/Startup.cpp
View File

@ -25,9 +25,9 @@
#include <filesystem>
#include <fstream>
#include <thread>
#include "Options.h"
extern int TraceBack;
bool Dev = false;
int ProxyPort = 0;
namespace fs = std::filesystem;
@ -95,11 +95,11 @@ std::string GetEP(char* P) {
return Ret;
}
#if defined(_WIN32)
void ReLaunch(int argc, char* args[]) {
void ReLaunch() {
std::string Arg;
for (int c = 2; c <= argc; c++) {
for (int c = 0; c <= options.game_arguments_length; c++) {
Arg += " ";
Arg += args[c - 1];
Arg += options.game_arguments[c - 1];
}
info("Relaunch!");
system("cls");
@ -108,11 +108,11 @@ void ReLaunch(int argc, char* args[]) {
std::this_thread::sleep_for(std::chrono::seconds(1));
exit(1);
}
void URelaunch(int argc, char* args[]) {
void URelaunch() {
std::string Arg;
for (int c = 2; c <= argc; c++) {
for (int c = 0; c <= options.game_arguments_length; c++) {
Arg += " ";
Arg += args[c - 1];
Arg += options.game_arguments[c - 1];
}
ShellExecute(nullptr, "open", (GetEP() + GetEN()).c_str(), Arg.c_str(), nullptr, SW_SHOWNORMAL);
ShowWindow(GetConsoleWindow(), 0);
@ -120,11 +120,11 @@ void URelaunch(int argc, char* args[]) {
exit(1);
}
#elif defined(__linux__)
void ReLaunch(int argc, char* args[]) {
void ReLaunch() {
std::string Arg;
for (int c = 2; c <= argc; c++) {
for (int c = 0; c <= options.game_arguments_length; c++) {
Arg += " ";
Arg += args[c - 1];
Arg += options.game_arguments[c - 1];
}
info("Relaunch!");
system("clear");
@ -132,11 +132,11 @@ void ReLaunch(int argc, char* args[]) {
std::this_thread::sleep_for(std::chrono::seconds(1));
exit(1);
}
void URelaunch(int argc, char* args[]) {
void URelaunch() {
std::string Arg;
for (int c = 2; c <= argc; c++) {
for (int c = 0; c <= options.game_arguments_length; c++) {
Arg += " ";
Arg += args[c - 1];
Arg += options.game_arguments[c - 1];
}
execl((GetEP() + GetEN()).c_str(), Arg.c_str(), NULL);
std::this_thread::sleep_for(std::chrono::seconds(1));
@ -144,23 +144,23 @@ void URelaunch(int argc, char* args[]) {
}
#endif
void CheckName(int argc, char* args[]) {
void CheckName() {
#if defined(_WIN32)
std::string DN = GetEN(), CDir = args[0], FN = CDir.substr(CDir.find_last_of('\\') + 1);
std::string DN = GetEN(), CDir = options.executable_name, FN = CDir.substr(CDir.find_last_of('\\') + 1);
#elif defined(__linux__)
std::string DN = GetEN(), CDir = args[0], FN = CDir.substr(CDir.find_last_of('/') + 1);
std::string DN = GetEN(), CDir = options.executable_name, FN = CDir.substr(CDir.find_last_of('/') + 1);
#endif
if (FN != DN) {
if (fs::exists(DN))
remove(DN.c_str());
if (fs::exists(DN))
ReLaunch(argc, args);
ReLaunch();
std::rename(FN.c_str(), DN.c_str());
URelaunch(argc, args);
URelaunch();
}
}
void CheckForUpdates(int argc, char* args[], 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 LatestVersion = HTTP::Get(
"https://backend.beammp.com/version/launcher?branch=" + Branch + "&pk=" + PublicKey);
@ -170,7 +170,7 @@ void CheckForUpdates(int argc, char* args[], const std::string& CV) {
std::string FileHash = hashpp::get::getFileHash(hashpp::ALGORITHMS::SHA2_256, EP);
if (FileHash != LatestHash && IsOutdated(Version(VersionStrToInts(GetVer() + GetPatch())), Version(VersionStrToInts(LatestVersion))) && !Dev) {
if (FileHash != LatestHash && IsOutdated(Version(VersionStrToInts(GetVer() + GetPatch())), Version(VersionStrToInts(LatestVersion))) && !options.no_download) {
info("Launcher update found!");
#if defined(__linux__)
error("Auto update is NOT implemented for the Linux version. Please update manually ASAP as updates contain security patches.");
@ -183,26 +183,13 @@ void CheckForUpdates(int argc, char* args[], const std::string& CV) {
"&pk="
+ PublicKey + "&branch=" + Branch,
EP);
URelaunch(argc, args);
URelaunch();
#endif
} else
info("Launcher version is up to date");
TraceBack++;
}
void CustomPort(int argc, char* argv[]) {
if (argc > 1) {
std::string Port = argv[1];
if (Port.find_first_not_of("0123456789") == std::string::npos) {
if (std::stoi(Port) > 1000) {
DEFAULT_PORT = std::stoi(Port);
warn("Running on custom port : " + std::to_string(DEFAULT_PORT));
}
}
if (argc > 2)
Dev = true;
}
}
#ifdef _WIN32
void LinuxPatch() {
@ -234,25 +221,27 @@ void LinuxPatch() {
#endif
#if defined(_WIN32)
void InitLauncher(int argc, char* argv[]) {
void InitLauncher() {
system("cls");
SetConsoleTitleA(("BeamMP Launcher v" + std::string(GetVer()) + GetPatch()).c_str());
InitLog();
CheckName(argc, argv);
CheckName();
LinuxPatch();
CheckLocalKey();
ConfigInit();
CustomPort(argc, argv);
CheckForUpdates(argc, argv, std::string(GetVer()) + GetPatch());
CheckForUpdates(std::string(GetVer()) + GetPatch());
}
#elif defined(__linux__)
void InitLauncher(int argc, char* argv[]) {
void InitLauncher() {
system("clear");
InitLog();
info("BeamMP Launcher v" + GetVer() + GetPatch());
CheckName(argc, argv);
CheckName();
CheckLocalKey();
ConfigInit();
CustomPort(argc, argv);
CheckForUpdates(argc, argv, std::string(GetVer()) + GetPatch());
CheckForUpdates(std::string(GetVer()) + GetPatch());
}
#endif
@ -316,7 +305,7 @@ void PreGame(const std::string& GamePath) {
CheckMP(GetGamePath() + "mods/multiplayer");
info("Game user path: " + GetGamePath());
if (!Dev) {
if (!options.no_download) {
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(),

6
src/main.cpp
View File

@ -13,6 +13,9 @@
#include <curl/curl.h>
#include <iostream>
#include <thread>
#include "Options.h"
Options options;
[[noreturn]] void flush() {
while (true) {
@ -45,7 +48,8 @@ int main(int argc, char** argv) try {
}
}
InitLauncher(argc, argv);
InitOptions(argc, argv, options);
InitLauncher();
info("IMPORTANT: You MUST keep this window open to play BeamMP!");