Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-10-10 06:43:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(db): client system info as reported by the client

Browse Source 
client_sysinfo (migrations mysql 102, sqlite 85) keeps the system description
each account's client sent at login, exactly as sent, plus the physical memory
read from it. While nothing but the memory in use changes, the account's newest
row gets the new time and one more login; otherwise a new row starts. Log
pruning deletes rows not seen for a while (eLog::CLIENT_SYSINFO) and deleting
an account deletes its rows.

Tests on SQLite alone (dDatabaseSqliteTests) and in the MySQL parity tests.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-09-29 18:40:22 -05:00
parent b67e0ba9ba
commit 7bc41f2246
18 changed files with 371 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
tests/dDatabaseTests/ChatHistorySqliteTests.cpp
View File

@@ -1,13 +1,14 @@
/**
* The chat history and chat flag tables on SQLite, with no other database needed: a fresh SQLite file gets every
* migration (MigrationRunner::RunMigrations, as the servers run them), then the IChatLog and IChatFlags methods are
* checked against what was written. DatabaseParityTests compares the same methods with MySQL when one is set up.
* migration (MigrationRunner::RunMigrations, as the servers run them), then the IChatLog, IChatFlags and IClientSysInfo
* methods are checked against what was written. DatabaseParityTests compares the same methods with MySQL when one is set up.
*/
#include <gtest/gtest.h>
#include <algorithm>
#include <cstdlib>
#include <filesystem>
#include <map>
#include <unistd.h>
#include "Database.h"
@@ -307,3 +308,84 @@ TEST_F(ChatHistorySqlite, PruningOldChatKeepsFlags) {
EXPECT_EQ(g_Db->CountChatMessages(all), before - 4);
EXPECT_EQ(g_Db->CountChatFlags({ .includePrivate = true, .includeWhispers = true }), flags);
}
// The client system info table (IClientSysInfo) shares this SQLite file: its rows don't touch the chat tables
namespace {
IClientSysInfo::SysInfoRow SysInfo(uint32_t account, int64_t time) {
IClientSysInfo::SysInfoRow s;
s.accountId = account;
s.firstSeen = s.lastSeen = time;
s.ip = "10.0.0.1";
s.clientOs = 1;
s.memoryStats = " 12345 p, 67890 vbytes.40 n-use.16717048 TKb-pmem.";
s.memoryTotalKb = 16717048;
s.videoCard = "NVIDIA GeForce GTX 1080 (HAL-hw vp)";
s.numberOfProcessors = 16;
s.processorType = 586;
s.processorLevel = 6;
s.processorRevision = 0x9e0a;
s.osVersionInfoSize = 276;
s.majorVersion = 6;
s.minorVersion = 2;
s.buildNumber = 9200;
s.platformId = 2;
return s;
}
}
TEST(ClientSysInfoSqlite, SameClientKeepsOneRow) {
auto s = SysInfo(900, 5000);
g_Db->RecordClientSysInfo(s);
s.lastSeen = 5100;
s.memoryStats = " 99999 p, 67890 vbytes.55 n-use.16717048 TKb-pmem."; // memory in use changes every login
g_Db->RecordClientSysInfo(s);
auto rows = g_Db->GetClientSysInfo(900, 10);
ASSERT_EQ(rows.size(), 1u);
EXPECT_EQ(rows[0].firstSeen, 5000);
EXPECT_EQ(rows[0].lastSeen, 5100);
EXPECT_EQ(rows[0].logins, 2u);
EXPECT_EQ(rows[0].memoryStats, s.memoryStats); // the newest login's text, as sent
EXPECT_EQ(rows[0].videoCard, s.videoCard);
EXPECT_EQ(rows[0].processorRevision, 0x9e0a);
EXPECT_EQ(rows[0].memoryTotalKb, 16717048u);
// Something else changes: a new row, newest first; going back to the old one starts another
s.firstSeen = s.lastSeen = 5200;
s.ip = "10.0.0.2";
g_Db->RecordClientSysInfo(s);
s.firstSeen = s.lastSeen = 5300;
s.ip = "10.0.0.1";
g_Db->RecordClientSysInfo(s);
rows = g_Db->GetClientSysInfo(900, 10);
ASSERT_EQ(rows.size(), 3u);
EXPECT_EQ(rows[0].ip, "10.0.0.1");
EXPECT_EQ(rows[0].firstSeen, 5300);
EXPECT_EQ(rows[1].ip, "10.0.0.2");
EXPECT_EQ(g_Db->GetClientSysInfo(900, 1).size(), 1u);
}
TEST(ClientSysInfoSqlite, LatestIsEachAccountsNewestRow) {
auto a = SysInfo(901, 6000);
g_Db->RecordClientSysInfo(a);
a.lastSeen = 6100;
a.buildNumber = 2600;
g_Db->RecordClientSysInfo(a);
g_Db->RecordClientSysInfo(SysInfo(902, 6050));
std::map<uint32_t, uint32_t> builds;
for (const auto& row : g_Db->GetLatestClientSysInfo(1000)) {
EXPECT_FALSE(builds.contains(row.accountId)) << row.accountId;
builds[row.accountId] = row.buildNumber;
}
EXPECT_EQ(builds[901], 2600u);
EXPECT_EQ(builds[902], 9200u);
}
TEST(ClientSysInfoSqlite, PruningDropsRowsNotSeenSince) {
g_Db->RecordClientSysInfo(SysInfo(903, 100));
auto kept = SysInfo(904, 100);
kept.lastSeen = 9000;
g_Db->RecordClientSysInfo(kept);
EXPECT_GE(g_Db->PruneLog(IDashboardAdmin::eLog::CLIENT_SYSINFO, 200), 1u);
EXPECT_TRUE(g_Db->GetClientSysInfo(903, 10).empty());
EXPECT_EQ(g_Db->GetClientSysInfo(904, 10).size(), 1u);
}

42
tests/dDatabaseTests/DatabaseParityTests.cpp
View File

@@ -898,7 +898,7 @@ TEST_F(ParitySeeded, LogsAndAudit) {
Both("PruneLog", [](GameDatabase& db) {
json out = json::array();
for (const auto log : { IDashboardAdmin::eLog::ACTIVITY, IDashboardAdmin::eLog::COMMAND, IDashboardAdmin::eLog::AUDIT,
IDashboardAdmin::eLog::CHEAT_DETECTION, IDashboardAdmin::eLog::CHAT, IDashboardAdmin::eLog::LOGIN_ADDRESS }) {
IDashboardAdmin::eLog::CHEAT_DETECTION, IDashboardAdmin::eLog::CHAT, IDashboardAdmin::eLog::LOGIN_ADDRESS, IDashboardAdmin::eLog::CLIENT_SYSINFO }) {
out.push_back(db.PruneLog(log, 1000)); // nothing is that old
}
return out;
@@ -1446,6 +1446,46 @@ TEST_F(ParitySeeded, Moderation) {
Both("GetLinkedAccounts", [](GameDatabase& db) { return json{ db.GetLinkedAccounts(1), db.GetLinkedAccounts(2), db.GetLinkedAccounts(3) }; });
Both("PruneLog login addresses", [](GameDatabase& db) { return db.PruneLog(IDashboardAdmin::eLog::LOGIN_ADDRESS, 1700000350); });
Both("CountLoginAddresses after prune", [](GameDatabase& db) { return json{ db.CountLoginAddresses(1), db.CountLoginAddresses(2) }; });
Both("RecordClientSysInfo", [](GameDatabase& db) {
IClientSysInfo::SysInfoRow s;
s.accountId = 1;
s.firstSeen = s.lastSeen = 1700000000;
s.ip = "10.0.0.1";
s.clientOs = 1;
s.memoryStats = "1 p,2 vbytes.3 n-use.4 TKb-pmem.";
s.memoryTotalKb = 4;
s.videoCard = "Card (HAL-hw vp)";
s.numberOfProcessors = 8;
s.processorType = 586;
s.processorLevel = 6;
s.processorRevision = 0x9e0a;
s.osVersionInfoSize = 276;
s.majorVersion = 6;
s.minorVersion = 2;
s.buildNumber = 9200;
s.platformId = 2;
db.RecordClientSysInfo(s);
s.lastSeen = 1700000100;
s.memoryStats = "9 p,2 vbytes.3 n-use.4 TKb-pmem.";
db.RecordClientSysInfo(s); // same client: the row is kept
s.lastSeen = 1700000200;
s.buildNumber = 2600;
db.RecordClientSysInfo(s); // changed: a new row
s.accountId = 2;
db.RecordClientSysInfo(s);
});
Both("GetClientSysInfo", [](GameDatabase& db) {
json out = json::array();
for (const auto& rows : { db.GetClientSysInfo(1, 10), db.GetLatestClientSysInfo(10) }) {
for (const auto& r : rows) {
out.push_back({ r.accountId, r.firstSeen, r.lastSeen, r.logins, r.ip, r.clientOs, r.memoryStats, r.memoryTotalKb, r.videoCard,
r.numberOfProcessors, r.processorType, r.processorLevel, r.processorRevision, r.osVersionInfoSize, r.majorVersion,
r.minorVersion, r.buildNumber, r.platformId });
}
}
return out;
});
Both("PruneLog client sysinfo", [](GameDatabase& db) { return db.PruneLog(IDashboardAdmin::eLog::CLIENT_SYSINFO, 1700000150); });
Both("InsertModerationDecision", [](GameDatabase& db) {
db.InsertModerationDecision("name", CHAR_ALICE2, "AliceRenamed", false, "Not allowed", 1700000000);
db.InsertModerationDecision("name", CHAR_ALICE2, "AliceOther", true, "", 1700000100);