mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2026-10-02 10:53:44 +00:00
350d35dab5
First step of moving hand written bitstream code to struct based messages (see docs/PacketArchitecture.md). No wire changes. - GameMsg is now only a server-internal event (delivered to handlers registered with RegisterMsg); NetGameMsg is a wire message with Send(sysAddr) (UNASSIGNED broadcasts), SendToClient(sysAddr) (one client, never broadcasts), WritePacket, Serialize, Deserialize and Handle. Mixing them up is now a compile error. NetGameMsgEvent<T> / DeliverLocally carry a wire message to local handlers; loot drops, pickup, the object debugger, GM invisibility and model RequestUse use them. The GM invisibility message keeps its target, so its bytes are unchanged. - Behaviour change: GameMessageHandler logs and drops messages whose Deserialize fails instead of handling them with default fields (the 4 messages already registered: RequestUse, RequestServerObjectInfo, ShootingGalleryFire, PickupItem). - LUBitStream (kept as on main) gets a virtual destructor (Mail deleted derived packets through the base) and WritePacket, also used by ChatPackets::SendRoutedMsg with identical bytes. - BitStreamUtils::WriteOptional/ReadOptional for default-flag fields and WriteLengthPrefixed/ReadLengthPrefixed for length prefixed strings. - Every message ID enumerator (MessageType::*, ServiceType, Mail's wire enums) is pinned with static_asserts, so renumbering or removing one fails to compile. - Tests: dServerMock copies each sent packet (it kept a pointer to the caller's destroyed BitStream); PacketTestUtils.h compares packets bit for bit; helper tests use hand computed golden bytes and equality with the hand written patterns they replace; compile-time checks keep the wire/internal split in place. - docs/PacketArchitecture.md: survey, target architecture, conventions, verification method and migration plan. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
89 lines
2.8 KiB
C++
89 lines
2.8 KiB
C++
#ifndef __GAMEDEPENDENCIES__H__
|
|
#define __GAMEDEPENDENCIES__H__
|
|
|
|
#include "Game.h"
|
|
#include "Logger.h"
|
|
#include "dServer.h"
|
|
#include "CDClientManager.h"
|
|
#include "EntityInfo.h"
|
|
#include "EntityManager.h"
|
|
#include "dConfig.h"
|
|
#include "dZoneManager.h"
|
|
#include "GameDatabase/TestSQL/TestSQLDatabase.h"
|
|
#include "Database.h"
|
|
#include <gtest/gtest.h>
|
|
#include <vector>
|
|
|
|
class dZoneManager;
|
|
class AssetManager;
|
|
|
|
// A packet captured by dServerMock::Send. The bytes are copied, so the capture stays valid
|
|
// after the sender's local BitStream goes out of scope.
|
|
struct CapturedPacket {
|
|
std::vector<uint8_t> bytes;
|
|
uint32_t bits = 0;
|
|
SystemAddress sysAddr = UNASSIGNED_SYSTEM_ADDRESS;
|
|
bool broadcast = false;
|
|
};
|
|
|
|
class dServerMock : public dServer {
|
|
std::vector<CapturedPacket> sentPackets;
|
|
RakNet::BitStream mostRecent;
|
|
public:
|
|
dServerMock() {};
|
|
~dServerMock() {};
|
|
|
|
// Returns a copy of the most recently sent packet, with its read pointer at the start, or nullptr if nothing was sent.
|
|
RakNet::BitStream* GetMostRecentBitStream() { return sentPackets.empty() ? nullptr : &mostRecent; };
|
|
const std::vector<CapturedPacket>& GetSentPackets() const { return sentPackets; }
|
|
void ClearSentPackets() { sentPackets.clear(); mostRecent.Reset(); }
|
|
|
|
void Send(RakNet::BitStream& bitStream, const SystemAddress& sysAddr, bool broadcast) override {
|
|
CapturedPacket& packet = sentPackets.emplace_back();
|
|
packet.bits = bitStream.GetNumberOfBitsUsed();
|
|
packet.bytes.assign(bitStream.GetData(), bitStream.GetData() + bitStream.GetNumberOfBytesUsed());
|
|
packet.sysAddr = sysAddr;
|
|
packet.broadcast = broadcast;
|
|
|
|
mostRecent.Reset();
|
|
mostRecent.WriteBits(packet.bytes.data(), packet.bits, false);
|
|
};
|
|
void SetZoneId(unsigned int zoneId) { mZoneID = zoneId; }
|
|
};
|
|
|
|
class GameDependenciesTest : public ::testing::Test {
|
|
protected:
|
|
void SetUpDependencies() {
|
|
info.pos = NiPoint3Constant::ZERO;
|
|
info.rot = QuatUtils::IDENTITY;
|
|
info.scale = 1.0f;
|
|
info.spawner = nullptr;
|
|
info.lot = 999;
|
|
Game::logger = new Logger("./testing.log", true, true);
|
|
Game::server = new dServerMock();
|
|
Game::config = new dConfig("worldconfig.ini");
|
|
Game::entityManager = new EntityManager();
|
|
Game::zoneManager = new dZoneManager();
|
|
Game::zoneManager->LoadZone(LWOZONEID(1, 0, 0));
|
|
Database::_setDatabase(new TestSQLDatabase()); // this new is managed by the Database
|
|
|
|
// Create a CDClientManager instance and load from defaults
|
|
CDClientManager::LoadValuesFromDefaults();
|
|
}
|
|
|
|
void TearDownDependencies() {
|
|
if (Game::server) delete Game::server;
|
|
if (Game::entityManager) delete Game::entityManager;
|
|
if (Game::zoneManager) delete Game::zoneManager;
|
|
if (Game::logger) {
|
|
Game::logger->Flush();
|
|
delete Game::logger;
|
|
}
|
|
if (Game::config) delete Game::config;
|
|
}
|
|
|
|
EntityInfo info{};
|
|
};
|
|
|
|
#endif //!__GAMEDEPENDENCIES__H__
|