diff --git a/dChatServer/ChatWebAPI.cpp b/dChatServer/ChatWebAPI.cpp index 4ba9d2af..33e2a9ad 100644 --- a/dChatServer/ChatWebAPI.cpp +++ b/dChatServer/ChatWebAPI.cpp @@ -18,109 +18,78 @@ namespace { const char* json_content_type = "Content-Type: application/json\r\n"; } +struct HttpReply { + uint32_t status = 404; + std::string message = "{\"error\":\"Not Found\"}"; +}; + void HandleRequests(mg_connection* connection, int request, void* request_data) { if (request == MG_EV_HTTP_MSG) { + HttpReply reply; const mg_http_message* const http_msg = static_cast(request_data); if (!http_msg) { - mg_http_reply(connection, 400, json_content_type, "{\"error\":\"Invalid Request\"}"); - return; - } - - // Handle Post requests - if (mg_strcmp(http_msg->method, mg_str("POST")) == 0) { - // handle announcements - if (mg_match(http_msg->uri, mg_str((root_path + "announce").c_str()), NULL)) { + reply.status = 400; + reply.message = "{\"error\":\"Invalid Request\"}"; + } else { + // Handle Post requests + if (mg_strcmp(http_msg->method, mg_str("POST")) == 0) { auto data = GeneralUtils::TryParse(http_msg->body.buf); if (!data) { - mg_http_reply(connection, 400, json_content_type, "{\"error\":\"Invalid JSON\"}"); - return; - } + reply.status = 400; + reply.message = "{\"error\":\"Invalid JSON\"}"; + } else if (mg_match(http_msg->uri, mg_str((root_path + "announce").c_str()), NULL)) { + auto& jsonBuffer = data.value(); + // handle announcements - if (!data.value().contains("title")) { - mg_http_reply(connection, 400, json_content_type, "{\"error\":\"Missing paramater: title\"}"); - return; - } - std::string title = data.value()["title"]; - if (!data.value().contains("message")) { - mg_http_reply(connection, 400, json_content_type, "{\"error\":\"Missing paramater: message\"}"); - return; - } - std::string message = data.value()["message"]; + if (!jsonBuffer.contains("title")) { + reply.status = 400; + reply.message = "{\"error\":\"Missing paramater: title\"}"; + } else if (!jsonBuffer.contains("message")) { + reply.status = 400; + reply.message = "{\"error\":\"Missing paramater: message\"}"; + } else { + std::string title = jsonBuffer["title"]; + std::string message = jsonBuffer["message"]; - // build and send the packet to all world servers - { - CBITSTREAM; - BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, MessageType::Chat::GM_ANNOUNCE); - bitStream.Write(title.size()); - bitStream.Write(title); - bitStream.Write(message.size()); - bitStream.Write(message); - Game::server->Send(bitStream, UNASSIGNED_SYSTEM_ADDRESS, true); - } + // build and send the packet to all world servers + CBITSTREAM; + BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, MessageType::Chat::GM_ANNOUNCE); + bitStream.Write(title.size()); + bitStream.Write(title); + bitStream.Write(message.size()); + bitStream.Write(message); + SEND_PACKET_BROADCAST; - mg_http_reply(connection, 200, json_content_type, "{\"status\":\"Announcement Sent\"}"); - return; - } - // Handle GET Requests - } else if (mg_strcmp(http_msg->method, mg_str("GET")) == 0) { - - // Get All Online players - if (mg_match(http_msg->uri, mg_str((root_path + "players").c_str()), NULL)) { - auto data = json::array(); - for (auto& [playerID, playerData] : Game::playerContainer.GetAllPlayers()) { - if (!playerData) continue; - data.push_back(playerData.to_json()); - } - if (data.empty()) { - mg_http_reply(connection, 200, json_content_type, "{\"error\":\"No Players Online\"}"); - } else { - mg_http_reply(connection, 200, json_content_type, data.dump().c_str()); - } - return; - - } else if (mg_match(http_msg->uri, mg_str((root_path + "teams").c_str()), NULL)) { - - // Get Teams - auto data = json::array(); - for (auto& teamData : Game::playerContainer.GetAllTeams()) { - if (!teamData) continue; - json toInsert; - toInsert["id"] = teamData->teamID; - toInsert["loot_flag"] = teamData->lootFlag; - toInsert["local"] = teamData->local; - - auto& leader = Game::playerContainer.GetPlayerData(teamData->leaderID); - toInsert["leader"] = leader.to_json(); - - json members; - for (auto& member : teamData->memberIDs) { - auto& playerData = Game::playerContainer.GetPlayerData(member); - - if (!playerData) continue; - members.push_back(playerData.to_json()); + reply.status = 200; + reply.message = "{\"status\":\"Announcement Sent\"}"; } - toInsert["members"] = members; - data.push_back(toInsert); } + // Handle GET Requests + } else if (mg_strcmp(http_msg->method, mg_str("GET")) == 0) { + // Get All Online players + if (mg_match(http_msg->uri, mg_str((root_path + "players").c_str()), NULL)) { + const json data = Game::playerContainer; - if (data.empty()) { - mg_http_reply(connection, 200, json_content_type, "{\"error\":\"No Teams Online\"}"); - } else { - mg_http_reply(connection, 200, json_content_type, data.dump().c_str()); + reply.status = 200; + reply.message = data.empty() ? "{\"error\":\"No Players Online\"}" : data.dump(); + } else if (mg_match(http_msg->uri, mg_str((root_path + "teams").c_str()), NULL)) { + // Get Teams + const json data = Game::playerContainer.GetTeamComtainer(); + + reply.status = 200; + reply.message = data.empty() ? "{\"error\":\"No Teams Online\"}" : data.dump(); } - return; - } } - // If it hasn't been handled then reply 404 Not Found - mg_http_reply(connection, 404, json_content_type, "{\"error\":\"Not Found\"}"); + LOG_DEBUG("Replying with status %d: %s", reply.status, reply.message.c_str()); + mg_http_reply(connection, reply.status, json_content_type, reply.message.c_str()); } } ChatWebAPI::ChatWebAPI() { - if (Game::logger->GetLogDebugStatements()) mg_log_set(MG_LL_DEBUG); + mg_log_set(MG_LL_NONE); mg_mgr_init(&mgr); // Initialize event manager } @@ -130,12 +99,17 @@ ChatWebAPI::~ChatWebAPI() { void ChatWebAPI::Listen() { // make listen address - const std::string& listen_ip = Game::config->GetValue("web_server_listen_ip"); - const std::string& listen_port = Game::config->GetValue("wed_server_listen_port"); + std::string listen_ip = Game::config->GetValue("web_server_listen_ip"); + if (listen_ip == "localhost") listen_ip = "127.0.0.1"; + + const std::string& listen_port = Game::config->GetValue("web_server_listen_port"); const std::string& listen_address = "http://" + listen_ip + ":" + listen_port; LOG("Starting web server on %s", listen_address.c_str()); - mg_http_listen(&mgr, listen_address.c_str(), HandleRequests, NULL); // Create HTTP listener + // Create HTTP listener + if (!mg_http_listen(&mgr, listen_address.c_str(), HandleRequests, NULL)) { + LOG("Failed to create web server listener"); + } } void ChatWebAPI::ReceiveRequests() { diff --git a/dChatServer/PlayerContainer.cpp b/dChatServer/PlayerContainer.cpp index 5c627156..2de5a027 100644 --- a/dChatServer/PlayerContainer.cpp +++ b/dChatServer/PlayerContainer.cpp @@ -15,18 +15,44 @@ using json = nlohmann::json; -const json PlayerData::to_json() const { - json data; - data["id"] = this->playerID; - data["name"] = this->playerName; - data["gm_level"] = this->gmLevel; - data["muted"] = this->GetIsMuted(); +void to_json(json& data, const PlayerData& playerData) { + data["id"] = playerData.playerID; + data["name"] = playerData.playerName; + data["gm_level"] = playerData.gmLevel; + data["muted"] = playerData.GetIsMuted(); - json& zoneID = data["zone_id"]; - zoneID["map_id"] = std::to_string(this->zoneID.GetMapID()); - zoneID["instance_id"] = std::to_string(this->zoneID.GetInstanceID()); - zoneID["clone_id"] = std::to_string(this->zoneID.GetCloneID()); - return data; + auto& zoneID = data["zone_id"]; + zoneID["map_id"] = std::to_string(playerData.zoneID.GetMapID()); + zoneID["instance_id"] = std::to_string(playerData.zoneID.GetInstanceID()); + zoneID["clone_id"] = std::to_string(playerData.zoneID.GetCloneID()); +} + +void to_json(json& data, const PlayerContainer& playerContainer) { + data = playerContainer.GetAllPlayers(); +} + +void to_json(json& data, const TeamContainer& teamContainer) { + for (auto& teamData : Game::playerContainer.GetTeams()) { + if (!teamData) continue; + data.push_back(*teamData); + } +} + +void to_json(json& data, const TeamData& teamData) { + data["id"] = teamData.teamID; + data["loot_flag"] = teamData.lootFlag; + data["local"] = teamData.local; + + auto& leader = Game::playerContainer.GetPlayerData(teamData.leaderID); + data["leader"] = leader.playerName; + + auto& members = data["members"]; + for (auto& member : teamData.memberIDs) { + auto& playerData = Game::playerContainer.GetPlayerData(member); + + if (!playerData) continue; + members.push_back(playerData); + } } void PlayerContainer::Initialize() { @@ -232,7 +258,7 @@ TeamData* PlayerContainer::CreateTeam(LWOOBJID leader, bool local) { team->leaderID = leader; team->local = local; - mTeams.push_back(team); + GetTeamsMut().push_back(team); AddMember(team, leader); @@ -240,7 +266,7 @@ TeamData* PlayerContainer::CreateTeam(LWOOBJID leader, bool local) { } TeamData* PlayerContainer::GetTeam(LWOOBJID playerID) { - for (auto* team : mTeams) { + for (auto* team : GetTeams()) { if (std::find(team->memberIDs.begin(), team->memberIDs.end(), playerID) == team->memberIDs.end()) continue; return team; @@ -348,9 +374,9 @@ void PlayerContainer::PromoteMember(TeamData* team, LWOOBJID newLeader) { } void PlayerContainer::DisbandTeam(TeamData* team) { - const auto index = std::find(mTeams.begin(), mTeams.end(), team); + const auto index = std::find(GetTeams().begin(), GetTeams().end(), team); - if (index == mTeams.end()) return; + if (index == GetTeams().end()) return; for (const auto memberId : team->memberIDs) { const auto& otherMember = GetPlayerData(memberId); @@ -365,15 +391,15 @@ void PlayerContainer::DisbandTeam(TeamData* team) { UpdateTeamsOnWorld(team, true); - mTeams.erase(index); + GetTeamsMut().erase(index); delete team; } void PlayerContainer::TeamStatusUpdate(TeamData* team) { - const auto index = std::find(mTeams.begin(), mTeams.end(), team); + const auto index = std::find(GetTeams().begin(), GetTeams().end(), team); - if (index == mTeams.end()) return; + if (index == GetTeams().end()) return; const auto& leader = GetPlayerData(team->leaderID); @@ -460,5 +486,5 @@ void PlayerContainer::Shutdown() { Database::Get()->UpdateActivityLog(id, eActivityType::PlayerLoggedOut, playerData.zoneID.GetMapID()); m_Players.erase(m_Players.begin()); } - for (auto* team : mTeams) if (team) delete team; + for (auto* team : GetTeams()) if (team) delete team; } diff --git a/dChatServer/PlayerContainer.h b/dChatServer/PlayerContainer.h index 91097134..1acbed25 100644 --- a/dChatServer/PlayerContainer.h +++ b/dChatServer/PlayerContainer.h @@ -10,6 +10,12 @@ enum class eGameMasterLevel : uint8_t; +struct TeamData; + +struct TeamContainer { + std::vector mTeams; +}; + struct IgnoreData { IgnoreData(const std::string& name, const LWOOBJID& id) : playerName{ name }, playerId{ id } {} inline bool operator==(const std::string& other) const noexcept { @@ -37,8 +43,6 @@ struct PlayerData { return muteExpire == 1 || muteExpire > time(NULL); } - const nlohmann::json to_json() const; - SystemAddress sysAddr{}; LWOZONEID zoneID{}; LWOOBJID playerID = LWOOBJID_EMPTY; @@ -51,6 +55,11 @@ struct PlayerData { bool isFTP = false; }; +void to_json(nlohmann::json& data, const PlayerData& playerData); +void to_json(nlohmann::json& data, const PlayerContainer& playerContainer); +void to_json(nlohmann::json& data, const TeamContainer& teamData); +void to_json(nlohmann::json& data, const TeamData& teamData); + struct TeamData { TeamData(); LWOOBJID teamID = LWOOBJID_EMPTY; // Internal use @@ -78,7 +87,7 @@ public: PlayerData& GetPlayerDataMutable(const std::string& playerName); uint32_t GetPlayerCount() { return m_PlayerCount; }; uint32_t GetSimCount() { return m_SimCount; }; - const std::map& GetAllPlayers() { return m_Players; }; + const std::map& GetAllPlayers() const { return m_Players; }; TeamData* CreateLocalTeam(std::vector members); TeamData* CreateTeam(LWOOBJID leader, bool local = false); @@ -93,7 +102,9 @@ public: LWOOBJID GetId(const std::u16string& playerName); uint32_t GetMaxNumberOfBestFriends() { return m_MaxNumberOfBestFriends; } uint32_t GetMaxNumberOfFriends() { return m_MaxNumberOfFriends; } - const std::vector& GetAllTeams() { return mTeams;}; + const TeamContainer& GetTeamComtainer() { return teamContainer; } + std::vector& GetTeamsMut() { return teamContainer.mTeams; }; + const std::vector& GetTeams() { return GetTeamsMut(); }; void Update(const float deltaTime); bool PlayerBeingRemoved(const LWOOBJID playerID) { return m_PlayersToRemove.contains(playerID); } @@ -101,7 +112,7 @@ public: private: LWOOBJID m_TeamIDCounter = 0; std::map m_Players; - std::vector mTeams; + TeamContainer teamContainer{}; std::unordered_map m_Names; std::map m_PlayersToRemove; uint32_t m_MaxNumberOfBestFriends = 5; diff --git a/docs/ChatWebAPI.yaml b/docs/ChatWebAPI.yaml index 3943db4b..e319adcb 100644 --- a/docs/ChatWebAPI.yaml +++ b/docs/ChatWebAPI.yaml @@ -130,7 +130,8 @@ components: type: boolean example: false leader: - $ref: "#/components/schemas/Player" + type: string + example: thisisatestname members: type: array items: @@ -147,4 +148,4 @@ components: example: A Mythran has taken Action against you! message: type: string - example: Check your mailbox for details! \ No newline at end of file + example: Check your mailbox for details! diff --git a/resources/chatconfig.ini b/resources/chatconfig.ini index 90e67c5a..d59d8252 100644 --- a/resources/chatconfig.ini +++ b/resources/chatconfig.ini @@ -10,4 +10,4 @@ max_number_of_friends=50 web_server_enabled=0 web_server_listen_ip=127.0.0.1 -wed_server_listen_port=2005 +web_server_listen_port=2005