Skip to content

refactor: optimize JSON handling, fix pointer safety, and improve overall stability #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lozatto wants to merge 14 commits into
base: main
Choose a base branch
from
Open

refactor: optimize JSON handling, fix pointer safety, and improve overall stability #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
66cadeb
A server crash was identified occurring when the system attempted to …
lozatto May 9, 2026
8de9ce8
I have analyzed the crash reports and implemented a series of fixes t…
lozatto May 9, 2026
4bb63cc
feat: implement cURL-based HTTP client and menu management system for…
lozatto May 9, 2026
f71c67b
feat: implement CLogApi module to handle event logging, server commun…
lozatto May 9, 2026
d84bb1c
feat: add CLogCurl class to handle asynchronous JSON POST requests us…
lozatto May 9, 2026
957208b
feat: implement CLogApi class to handle remote event logging and API …
lozatto May 9, 2026
c62482d
feat: initialize LogApi plugin with cURL, JSON support, and event han…
lozatto May 9, 2026
2e48e0a
feat: add Makefile for building LogApi on Linux
lozatto May 9, 2026
45ac12a
feat: implement Metamod plugin skeleton with event and player logging…
lozatto May 9, 2026
2515c0e
remove console logs
lozatto May 15, 2026
cc5ac56
feat: implement ReHLDS and ReGameDLL API integration with hookchains
lozatto May 15, 2026
e7006d2
feat: implement LogApi class for event management and server communic…
lozatto May 15, 2026
d85af10
feat: implement ReHLDS and ReGameDLL API integration with hookchains
lozatto May 15, 2026
e628e8d
Merge branch 'main' into main
lozatto May 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 62 additions & 41 deletions LogApi/LogApi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,16 @@ void CLogApi::ServerActivate() {
// Set file pointer to start of file
fseek(fp, 0, SEEK_SET);

// Create empty std::string with file size
std::string buffer(fs, '\0');
// If read something
if (fs > 0) {
// Create empty std::string with file size
std::string buffer(fs, '\0');

// Read file to std::string buffer
size_t elements = fread(&buffer[0], 1, fs, fp);
// Read file to std::string buffer
size_t elements = fread(&buffer[0], 1, fs, fp);

// If read something
if (elements > 0) {
// If read something
if (elements > 0) {
// Read data
auto json = nlohmann::ordered_json::parse(buffer, nullptr, true, true);

Expand All @@ -51,18 +53,20 @@ void CLogApi::ServerActivate() {
std::make_pair(event.key(), event.value().get<bool>()));
}
}
}

// Close file pointer
fclose(fp);
// Close file pointer
fclose(fp);
} else {
// Failed on error
LOG_CONSOLE(PLID, "[%s] Failed to open file: %s", __func__,
LOG_API_FILE_EVENTS);
}
} catch (const nlohmann::ordered_json::parse_error &e) {
// JSON exeption errors
LOG_CONSOLE(PLID, "[%s] %s", __func__, e.what());
} catch (const std::exception &e) {
// JSON or other exception errors
LOG_CONSOLE(PLID, "[%s] Exception: %s", __func__, e.what());
}

}

// On server deactivate
Expand Down Expand Up @@ -125,7 +129,7 @@ int CLogApi::EventEnabled(const char *EventName) {
}

// Send event
void CLogApi::SendEvent(int EventIndex, nlohmann::ordered_json Event) {
void CLogApi::SendEvent(int EventIndex, const nlohmann::ordered_json& Event) {
// Is Running
if (this->m_Running) {
// If address is set
Expand All @@ -139,12 +143,21 @@ void CLogApi::SendEvent(int EventIndex, nlohmann::ordered_json Event) {
// If JSON is not empty
if (!Event.empty()) {
if (gLogCvar.m_Timeout) {
if (gLogCvar.m_Bearer) {
// POST to webserver
gLogCurl.PostJSON(gLogCvar.m_Address->string,
(long)gLogCvar.m_Timeout->value,
gLogCvar.m_Bearer->string, Event.dump(),
EventIndex);
if (gLogCvar.m_Bearer && gLogCvar.m_Bearer->string) {
try {
// POST to webserver
// Use error_handler_t::replace to avoid crashes on invalid UTF-8
gLogCurl.PostJSON(
gLogCvar.m_Address->string,
(long)gLogCvar.m_Timeout->value,
gLogCvar.m_Bearer->string,
Event.dump(-1, ' ', false,
nlohmann::ordered_json::error_handler_t::replace),
EventIndex);
} catch (const std::exception &e) {
LOG_CONSOLE(PLID, "[%s] JSON Serialization error: %s",
__func__, e.what());
}
}
}
}
Expand Down Expand Up @@ -184,9 +197,9 @@ void CLogApi::CallbackResult(CURL *ch, size_t Size, const char *Memory,
gLogApi.EventResult(EventIndex, Result);
}
}
} catch (const nlohmann::ordered_json::parse_error &e) {
} catch (const std::exception &e) {
// Log
LOG_CONSOLE(PLID, "[%s] %s", __func__, e.what());
LOG_CONSOLE(PLID, "[%s] Exception: %s", __func__, e.what());
}
}
}
Expand All @@ -202,7 +215,7 @@ void CLogApi::CallbackResult(CURL *ch, size_t Size, const char *Memory,
}

// Parse event result
void CLogApi::EventResult(int EventIndex, nlohmann::ordered_json Data) {
void CLogApi::EventResult(int EventIndex, const nlohmann::ordered_json& Data) {
// Check if has event 'ServerCommand' result from api
if (Data.contains("ServerCommand")) {
this->ServerCommand(EventIndex, Data);
Expand Down Expand Up @@ -230,7 +243,7 @@ void CLogApi::EventResult(int EventIndex, nlohmann::ordered_json Data) {
}

// Execute server command from result
void CLogApi::ServerCommand(int EventIndex, nlohmann::ordered_json Data) {
void CLogApi::ServerCommand(int EventIndex, const nlohmann::ordered_json& Data) {
if (gLogCvar.m_ExecCommands) {
if (gLogCvar.m_ExecCommands->value <= 0.0f) {
return;
Expand Down Expand Up @@ -280,7 +293,7 @@ void CLogApi::ServerCommand(int EventIndex, nlohmann::ordered_json Data) {
}

// Open menu from result
void CLogApi::ShowMenu(int EventIndex, nlohmann::ordered_json Data) {
void CLogApi::ShowMenu(int EventIndex, const nlohmann::ordered_json& Data) {
if (!Data[__func__].empty()) {
if (Data[__func__].is_object()) {
if (!Data[__func__]["Items"].empty()) {
Expand Down Expand Up @@ -320,8 +333,6 @@ void CLogApi::ShowMenu(int EventIndex, nlohmann::ordered_json Data) {
} catch (const nlohmann::ordered_json::exception &e) {
LOG_CONSOLE(PLID, "[%s] %s", __func__, e.what());
}
} else {
LOG_CONSOLE(PLID, "[%s] Menu is empty", __func__);
}
}
}
Expand All @@ -330,7 +341,7 @@ void CLogApi::ShowMenu(int EventIndex, nlohmann::ordered_json Data) {

// Open menu function
void CLogApi::Menu(int EntityIndex, std::string Title, bool Exit,
std::string Callback, nlohmann::ordered_json Items) {
std::string Callback, const nlohmann::ordered_json& Items) {
auto Player = UTIL_PlayerByIndexSafe(EntityIndex);

if (Player) {
Expand Down Expand Up @@ -369,7 +380,7 @@ void CLogApi::MenuHandle(int EntityIndex, std::string Callback,
}

// Print to client from result
void CLogApi::ClientPrint(int EventIndex, nlohmann::ordered_json Data) {
void CLogApi::ClientPrint(int EventIndex, const nlohmann::ordered_json& Data) {
// If is not empty
if (!Data[__func__].empty()) {
try {
Expand All @@ -393,8 +404,10 @@ void CLogApi::ClientPrint(int EventIndex, nlohmann::ordered_json Data) {
// If has entity index
if (EntityId > 0) {
// Get entity pointer
pEntity =
!FNullEnt(INDEXENT(EntityId)) ? INDEXENT(EntityId) : nullptr;
auto Player = UTIL_PlayerByIndexSafe(EntityId);
if (Player) {
pEntity = Player->edict();
}
}

// If is not empty
Expand All @@ -411,7 +424,7 @@ void CLogApi::ClientPrint(int EventIndex, nlohmann::ordered_json Data) {
}

// Print to player chat from result
void CLogApi::PrintChat(int EventIndex, nlohmann::ordered_json Data) {
void CLogApi::PrintChat(int EventIndex, const nlohmann::ordered_json& Data) {
// If is not empty
if (!Data[__func__].empty()) {
try {
Expand All @@ -431,8 +444,10 @@ void CLogApi::PrintChat(int EventIndex, nlohmann::ordered_json Data) {
// If has entity index
if (EntityId > 0) {
// Get entity pointer
pEntity =
!FNullEnt(INDEXENT(EntityId)) ? INDEXENT(EntityId) : nullptr;
auto Player = UTIL_PlayerByIndexSafe(EntityId);
if (Player) {
pEntity = Player->edict();
}
}

// If is not empty
Expand All @@ -449,7 +464,7 @@ void CLogApi::PrintChat(int EventIndex, nlohmann::ordered_json Data) {
}

// Print to hudmessage chat from result
void CLogApi::ShowHudMessage(int EventIndex, nlohmann::ordered_json Data) {
void CLogApi::ShowHudMessage(int EventIndex, const nlohmann::ordered_json& Data) {
// If is not empty
if (!Data[__func__].empty()) {
try {
Expand All @@ -473,8 +488,10 @@ void CLogApi::ShowHudMessage(int EventIndex, nlohmann::ordered_json Data) {
// If has entity index
if (EntityId > 0) {
// Get entity pointer
pEntity =
!FNullEnt(INDEXENT(EntityId)) ? INDEXENT(EntityId) : nullptr;
auto Player = UTIL_PlayerByIndexSafe(EntityId);
if (Player) {
pEntity = Player->edict();
}
}

// If is not empty
Expand All @@ -497,25 +514,29 @@ nlohmann::ordered_json CLogApi::GetServerInfo() {
nlohmann::ordered_json ServerInfo;

// Set address
ServerInfo["Address"] = g_engfuncs.pfnCVarGetString("net_address");
auto NetAddress = g_engfuncs.pfnCVarGetString("net_address");
ServerInfo["Address"] = NetAddress ? NetAddress : "";

// Set hostname
ServerInfo["Hostname"] = g_engfuncs.pfnCVarGetString("hostname");
auto Hostname = g_engfuncs.pfnCVarGetString("hostname");
ServerInfo["Hostname"] = Hostname ? Hostname : "";

// Set map name
ServerInfo["Map"] = STRING(gpGlobals->mapname);
auto MapName = STRING(gpGlobals->mapname);
ServerInfo["Map"] = MapName ? MapName : "";

// Set game
ServerInfo["Game"] = "Counter-Strike";

// If CSGameRules is not null
if (g_pGameRules) {
auto Rules = CSGameRules();
// If server has game description
if (CSGameRules()->m_GameDesc) {
if (Rules && Rules->m_GameDesc) {
// If is not empty
if (CSGameRules()->m_GameDesc[0u] != '\0') {
if (Rules->m_GameDesc[0u] != '\0') {
// Set game description name
ServerInfo["Game"] = CSGameRules()->m_GameDesc;
ServerInfo["Game"] = Rules->m_GameDesc;
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions LogApi/LogApi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,34 +19,34 @@ class CLogApi
int EventEnabled(const char* EventName);

// Send Event
void SendEvent(int EventIndex, nlohmann::ordered_json EventData);
void SendEvent(int EventIndex, const nlohmann::ordered_json& EventData);

// Callback Result
void CallbackResult(CURL* ch, size_t Size, const char* Memory, int EventIndex);

// Parse Event Result
void EventResult(int EventIndex, nlohmann::ordered_json Result);
void EventResult(int EventIndex, const nlohmann::ordered_json& Result);

// Server Command
void ServerCommand(int EventIndex, nlohmann::ordered_json Data);
void ServerCommand(int EventIndex, const nlohmann::ordered_json& Data);

// Show Menu
void ShowMenu(int EventIndex, nlohmann::ordered_json Data);
void ShowMenu(int EventIndex, const nlohmann::ordered_json& Data);

// Open Menu
void Menu(int EntityIndex, std::string Title, bool Exit, std::string Callback, nlohmann::ordered_json Items);
void Menu(int EntityIndex, std::string Title, bool Exit, std::string Callback, const nlohmann::ordered_json& Items);

// Menu Handle
static void MenuHandle(int EntityIndex, std::string Callback, P_MENU_ITEM Item);

// Print to client from result
void ClientPrint(int EventIndex, nlohmann::ordered_json Data);
void ClientPrint(int EventIndex, const nlohmann::ordered_json& Data);

// Server Say Text
void PrintChat(int EventIndex, nlohmann::ordered_json Data);
void PrintChat(int EventIndex, const nlohmann::ordered_json& Data);

// HUD Message Text
void ShowHudMessage(int EventIndex, nlohmann::ordered_json Data);
void ShowHudMessage(int EventIndex, const nlohmann::ordered_json& Data);

// Get Server info
nlohmann::ordered_json GetServerInfo();
Expand Down
2 changes: 0 additions & 2 deletions LogApi/LogCommand.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,6 @@ void CLogCommand::OpenMotd() {
// Send Server Information
void CLogCommand::ServerInfo() {
gLogEvent.ServerInfo();

LOG_CONSOLE(PLID, "[%s] Server info sent to webserver.", Plugin_info.logtag);
}

// Get Hudmessage Parameters
Expand Down
39 changes: 24 additions & 15 deletions LogApi/LogCurl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,15 @@ CLogCurl gLogCurl;

void CLogCurl::ServerActivate() {
if (!this->m_MultiHandle) {
this->m_RequestIndex = 0;
this->m_RequestIndex = 1;

this->m_Data.clear();

curl_global_init(CURL_GLOBAL_ALL);
static bool GlobalInit = false;
if (!GlobalInit) {
curl_global_init(CURL_GLOBAL_ALL);
GlobalInit = true;
}

this->m_MultiHandle = curl_multi_init();
}
Expand All @@ -23,25 +27,25 @@ void CLogCurl::ServerFrame() {

curl_multi_perform(this->m_MultiHandle, &HandleCount);

while (ProcessedThisFrame < 5 && (MsgInfo = curl_multi_info_read(
this->m_MultiHandle, &HandleCount))) {
while ((MsgInfo = curl_multi_info_read(this->m_MultiHandle, &HandleCount))) {
if (MsgInfo->msg == CURLMSG_DONE) {
char *pPrivate = nullptr;
curl_easy_getinfo(MsgInfo->easy_handle, CURLINFO_PRIVATE, &pPrivate);
long Index = (long)(intptr_t)pPrivate;
if (curl_easy_getinfo(MsgInfo->easy_handle, CURLINFO_PRIVATE, &pPrivate) == CURLE_OK && pPrivate) {
long Index = (long)(intptr_t)pPrivate;

if (this->m_Data.find(Index) != this->m_Data.end()) {
gLogApi.CallbackResult(MsgInfo->easy_handle, this->m_Data[Index].Size,
this->m_Data[Index].Memory,
this->m_Data[Index].EventIndex);
if (this->m_Data.find(Index) != this->m_Data.end()) {
gLogApi.CallbackResult(MsgInfo->easy_handle, this->m_Data[Index].Size,
this->m_Data[Index].Memory,
this->m_Data[Index].EventIndex);

free(this->m_Data[Index].Memory);
free(this->m_Data[Index].Memory);

if (this->m_Data[Index].Headers) {
curl_slist_free_all(this->m_Data[Index].Headers);
}
if (this->m_Data[Index].Headers) {
curl_slist_free_all(this->m_Data[Index].Headers);
}

this->m_Data.erase(Index);
this->m_Data.erase(Index);
}
}

curl_multi_remove_handle(this->m_MultiHandle, MsgInfo->easy_handle);
Expand Down Expand Up @@ -99,6 +103,8 @@ void CLogCurl::PostJSON(const char *url, long Timeout, std::string BearerToken,
curl_easy_setopt(ch, CURLOPT_SSL_VERIFYPEER, 1L);
curl_easy_setopt(ch, CURLOPT_SSL_VERIFYHOST, 2L);

curl_easy_setopt(ch, CURLOPT_NOSIGNAL, 1L);

curl_easy_setopt(ch, CURLOPT_WRITEDATA,
(void *)&this->m_Data[this->m_RequestIndex]);

Expand Down Expand Up @@ -137,6 +143,9 @@ size_t CLogCurl::WriteMemoryCallback(void *contents, size_t size, size_t nmemb,
mem->Memory[mem->Size] = 0;

return realsize;
} else {
// Log memory error
LOG_CONSOLE(PLID, "[%s] Memory allocation failed!", __func__);
}
}
}
Expand Down
Loading