BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2026-04-24 00:46:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use v2 api

Browse Source
This commit is contained in:
Lion Kortlepel
2021-09-23 00:14:38 +02:00
committed by Lion
parent 0961f86662
commit d0431c0b9d
1 changed files with 13 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/THeartbeatThread.cpp
View File

@@ -59,7 +59,8 @@ void THeartbeatThread::operator()() {
json::Document Doc; json::Document Doc;
bool Ok = false; bool Ok = false;
for (const auto& Url : Urls) { for (const auto& Url : Urls) {
T = Http::POST(Url, Target, {"heartbeat-api-v", "1.0.0"}, Body, false, &ResponseCode); T = Http::POST(Url, Target, { { "api-v", "2" } }, Body, false, &ResponseCode);
trace(T);
Doc.Parse(T.data(), T.size()); Doc.Parse(T.data(), T.size());
if (Doc.HasParseError() || !Doc.IsObject()) { if (Doc.HasParseError() || !Doc.IsObject()) {
error("Backend response failed to parse as valid json"); error("Backend response failed to parse as valid json");
@@ -80,10 +81,9 @@ void THeartbeatThread::operator()() {
std::string Message {}; std::string Message {};
const auto StatusKey = "status"; const auto StatusKey = "status";
const auto CodeKey = "code"; const auto CodeKey = "code";
const auto MessageKey = "message"; const auto MessageKey = "msg";
if (!Ok) {
isAuth = false; if (Ok) {
} else {
if (Doc.HasMember(StatusKey) && Doc[StatusKey].IsString()) { if (Doc.HasMember(StatusKey) && Doc[StatusKey].IsString()) {
Status = Doc[StatusKey].GetString(); Status = Doc[StatusKey].GetString();
} else { } else {
@@ -108,32 +108,20 @@ void THeartbeatThread::operator()() {
} }
} }
if ((T.substr(0, 2) != "20" && ResponseCode != 200) || ResponseCode != 200) { if (Ok && !isAuth) {
trace("got " + T + " from backend"); if (Status == "2000") {
SentryReportError(Application::GetBackendHostname() + Target, ResponseCode);
std::this_thread::sleep_for(std::chrono::milliseconds(500));
T = Http::POST(Application::GetBackup1Hostname(), Target, {}, Body, false, &ResponseCode);
if ((T.substr(0, 2) != "20" && ResponseCode != 200) || ResponseCode != 200) {
if ((T.substr(0, 2) != "20" && ResponseCode != 200) || ResponseCode != 200) {
warn("Backend system refused server! Server will not show in the public server list.");
SentryReportError(Application::GetBackup2Hostname() + Target, ResponseCode);
}
}
}
if (!isAuth) {
if (T == "2000") {
info(("Authenticated!")); info(("Authenticated!"));
isAuth = true; isAuth = true;
} else if (T == "200") { } else if (Status == "200") {
info(("Resumed authenticated session!")); info(("Resumed authenticated session!"));
isAuth = true; isAuth = true;
} else {
if (Message.empty()) {
Message = "Backend didn't provide a reason";
}
error("Backend REFUSED the auth key. " + Message);
} }
} }
//SocketIO::Get().SetAuthenticated(isAuth);
} }
} }