jessica
/
Jupiter-Bot
mirror of https://github.com/JAJames/Jupiter-Bot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

First pass: prep for multiple upstreams

release/1.1
Jessica James 3 years ago
parent
6751d22c21
commit
718698af6c
2 changed files with 46 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 68
      src/Plugins/RenX/RenX.Relay/RenX_Relay.cpp
  2. 16
      src/Plugins/RenX/RenX.Relay/RenX_Relay.h

68
src/Plugins/RenX/RenX.Relay/RenX_Relay.cpp
View File

@ -27,23 +27,24 @@ int RenX_RelayPlugin::think() {
for (auto& server_pair : m_server_info_map) { for (auto& server_pair : m_server_info_map) {
auto server = server_pair.first; auto server = server_pair.first;
auto& server_info = server_pair.second; auto& server_info = server_pair.second;
auto& devbot_socket = server_info.m_socket; auto& upstream_socket = server_info.m_socket;
const auto& upstream_name = get_upstream_name(server_info);
if (!devbot_socket) { if (!upstream_socket) {
// This should never happen // This should never happen
continue; continue;
} }
if (!server_info.m_devbot_connected) { if (!server_info.m_connected) {
// Not connected; attempt retry if needed // Not connected; attempt retry if needed
if (std::chrono::steady_clock::now() >= server_info.m_last_connect_attempt + g_reconnect_delay) { if (std::chrono::steady_clock::now() >= server_info.m_last_connect_attempt + g_reconnect_delay) {
if (devbot_socket->connect(m_upstream_hostname.c_str(), m_upstream_port)) { if (upstream_socket->connect(m_upstream_hostname.c_str(), m_upstream_port)) {
// There's some handshake garbage that needs to go on here so the devbot accepts us // There's some handshake garbage that needs to go on here so the upstream accepts us
devbot_connected(*server, server_info); upstream_connected(*server, server_info);
server->sendLogChan(IRCCOLOR "03[RenX]" IRCCOLOR " Socket successfully reconnected to DevBot; game server now listed."); server->sendLogChan(IRCCOLOR "03[RenX]" IRCCOLOR " Socket successfully reconnected to %.*s; game server now listed.", upstream_name.size(), upstream_name.data());
} }
else { else {
server->sendLogChan(IRCCOLOR "04[Error]" IRCCOLOR " Failed to reconnect to DevBot; game server not listed."); server->sendLogChan(IRCCOLOR "04[Error]" IRCCOLOR " Failed to reconnect to %.*s; game server not listed.", upstream_name.size(), upstream_name.data());
} }
// Update our timings // Update our timings
@ -54,14 +55,14 @@ int RenX_RelayPlugin::think() {
else if (std::chrono::steady_clock::now() - server_info.m_last_activity >= g_activity_timeout) // ping timeout else if (std::chrono::steady_clock::now() - server_info.m_last_activity >= g_activity_timeout) // ping timeout
{ {
// Ping timeout; disconnect immediately // Ping timeout; disconnect immediately
server->sendLogChan(STRING_LITERAL_AS_REFERENCE(IRCCOLOR "04[Error]" IRCCOLOR " Disconnected from DevBot (ping timeout); game server is no longer listed.")); server->sendLogChan(IRCCOLOR "04[Error]" IRCCOLOR " Disconnected from %.*s (ping timeout); game server is no longer listed.", upstream_name.size(), upstream_name.data());
devbot_disconnected(*server, server_info); upstream_disconnected(*server, server_info);
} }
else { else {
// Connected and fine // Connected and fine
if (devbot_socket->recv() > 0) // Data received if (upstream_socket->recv() > 0) // Data received
{ {
auto& buffer = devbot_socket->getBuffer(); auto& buffer = upstream_socket->getBuffer();
Jupiter::ReadableString::TokenizeResult<Jupiter::Reference_String> result = Jupiter::ReferenceString::tokenize(buffer, '\n'); Jupiter::ReadableString::TokenizeResult<Jupiter::Reference_String> result = Jupiter::ReferenceString::tokenize(buffer, '\n');
if (result.token_count != 0) if (result.token_count != 0)
{ {
@ -69,32 +70,32 @@ int RenX_RelayPlugin::think() {
server_info.m_last_line.concat(result.tokens[0]); server_info.m_last_line.concat(result.tokens[0]);
if (result.token_count != 1) if (result.token_count != 1)
{ {
// Process devbot message received // Process upstream message received
process_devbot_message(server, server_info.m_last_line, server_info); process_upstream_message(server, server_info.m_last_line, server_info);
server_info.m_last_line = result.tokens[result.token_count - 1]; server_info.m_last_line = result.tokens[result.token_count - 1];
for (size_t index = 1; index != result.token_count - 1; ++index) for (size_t index = 1; index != result.token_count - 1; ++index)
process_devbot_message(server, result.tokens[index], server_info); process_upstream_message(server, result.tokens[index], server_info);
} }
} }
} }
else if (Jupiter::Socket::getLastError() == JUPITER_SOCK_EWOULDBLOCK) // Operation would block (no new data) else if (Jupiter::Socket::getLastError() == JUPITER_SOCK_EWOULDBLOCK) // Operation would block (no new data)
{ {
if (std::chrono::steady_clock::now() - server_info.m_last_activity >= g_activity_timeout) { if (std::chrono::steady_clock::now() - server_info.m_last_activity >= g_activity_timeout) {
devbot_disconnected(*server, server_info); upstream_disconnected(*server, server_info);
} }
} }
else // This is a serious error else // This is a serious error
{ {
devbot_disconnected(*server, server_info); upstream_disconnected(*server, server_info);
server->sendLogChan(IRCCOLOR "07[Warning]" IRCCOLOR " Connection to DevBot lost. Reconnection attempt in progress."); server->sendLogChan(IRCCOLOR "07[Warning]" IRCCOLOR " Connection to %.*s lost. Reconnection attempt in progress.", upstream_name.size(), upstream_name.data());
if (devbot_socket->connect(m_upstream_hostname.c_str(), m_upstream_port)) { if (upstream_socket->connect(m_upstream_hostname.c_str(), m_upstream_port)) {
devbot_connected(*server, server_info); upstream_connected(*server, server_info);
server->sendLogChan(IRCCOLOR "06[Progress]" IRCCOLOR " Connection to DevBot reestablished. Initializing Renegade-X RCON protocol..."); server->sendLogChan(IRCCOLOR "06[Progress]" IRCCOLOR " Connection to %.*s reestablished. Initializing Renegade-X RCON protocol...", upstream_name.size(), upstream_name.data());
} }
else { else {
server->sendLogChan(IRCCOLOR "04[Error]" IRCCOLOR " Connection to DevBot lost. Reconnection attempt failed."); server->sendLogChan(IRCCOLOR "04[Error]" IRCCOLOR " Connection to %.*s lost. Reconnection attempt failed.", upstream_name.size(), upstream_name.data());
} }
// Update our timings // Update our timings
@ -208,10 +209,10 @@ bool RenX_RelayPlugin::initialize() {
void RenX_RelayPlugin::RenX_OnServerFullyConnected(RenX::Server &server) { void RenX_RelayPlugin::RenX_OnServerFullyConnected(RenX::Server &server) {
auto& server_info = m_server_info_map[&server]; auto& server_info = m_server_info_map[&server];
if (!server_info.m_devbot_connected) { if (!server_info.m_connected) {
server_info.m_socket = std::unique_ptr<Jupiter::TCPSocket>(new Jupiter::TCPSocket()); server_info.m_socket = std::unique_ptr<Jupiter::TCPSocket>(new Jupiter::TCPSocket());
if (server_info.m_socket->connect(m_upstream_hostname.c_str(), m_upstream_port)) { if (server_info.m_socket->connect(m_upstream_hostname.c_str(), m_upstream_port)) {
devbot_connected(server, server_info); upstream_connected(server, server_info);
} }
} }
} }
@ -231,6 +232,7 @@ void RenX_RelayPlugin::RenX_OnServerDisconnect(RenX::Server &server, RenX::Disco
// There's not truly any way to know for certain that a token is a player token without message-specific positional context, // There's not truly any way to know for certain that a token is a player token without message-specific positional context,
// but the format is just specific enough that there shouldn't be many false positives. For false positives that do occur, // but the format is just specific enough that there shouldn't be many false positives. For false positives that do occur,
// we likely don't really care anyways, since this is just getting forwarded to the devbot // we likely don't really care anyways, since this is just getting forwarded to the devbot
// maybe this could be improved upon by also verifying the third component truly is a player's name
bool is_player_token(const char* begin, const char* end) { bool is_player_token(const char* begin, const char* end) {
std::regex player_token_regex{ "[A-Za-z]*,b?[0-9]+,.+" }; std::regex player_token_regex{ "[A-Za-z]*,b?[0-9]+,.+" };
std::cmatch match_result; std::cmatch match_result;
@ -284,7 +286,7 @@ std::string to_hex(T in_integer) {
} }
void RenX_RelayPlugin::RenX_OnRaw(RenX::Server &server, const Jupiter::ReadableString &line) { void RenX_RelayPlugin::RenX_OnRaw(RenX::Server &server, const Jupiter::ReadableString &line) {
// Not parsing any escape sequences, so data gets sent to devbot exactly as it's received here. Copy tokens where needed to process escape sequences. // Not parsing any escape sequences, so data gets sent upstream exactly as it's received here. Copy tokens where needed to process escape sequences.
Jupiter::ReadableString::TokenizeResult<Jupiter::String_Strict> tokens = Jupiter::StringS::tokenize(line, RenX::DelimC); Jupiter::ReadableString::TokenizeResult<Jupiter::String_Strict> tokens = Jupiter::StringS::tokenize(line, RenX::DelimC);
bool required_sanitization = false; bool required_sanitization = false;
@ -300,7 +302,7 @@ void RenX_RelayPlugin::RenX_OnRaw(RenX::Server &server, const Jupiter::ReadableS
return; return;
} }
ext_server_info& server_info = server_info_map_itr->second; upstream_server_info& server_info = server_info_map_itr->second;
Jupiter::TCPSocket* socket = server_info.m_socket.get(); Jupiter::TCPSocket* socket = server_info.m_socket.get();
if (!socket) { if (!socket) {
// early out: no upstream RCON session // early out: no upstream RCON session
@ -513,8 +515,12 @@ void RenX_RelayPlugin::RenX_OnRaw(RenX::Server &server, const Jupiter::ReadableS
} }
} }
void RenX_RelayPlugin::devbot_connected(RenX::Server& in_server, ext_server_info& in_server_info) { std::string_view RenX_RelayPlugin::get_upstream_name(const upstream_server_info&) {
in_server_info.m_devbot_connected = true; return m_upstream_hostname; // Will point to stream-specific name later
}
void RenX_RelayPlugin::upstream_connected(RenX::Server& in_server, upstream_server_info& in_server_info) {
in_server_info.m_connected = true;
in_server_info.m_socket->setBlocking(false); in_server_info.m_socket->setBlocking(false);
in_server_info.m_last_connect_attempt = std::chrono::steady_clock::now(); in_server_info.m_last_connect_attempt = std::chrono::steady_clock::now();
in_server_info.m_last_activity = in_server_info.m_last_connect_attempt; in_server_info.m_last_activity = in_server_info.m_last_connect_attempt;
@ -537,15 +543,15 @@ void RenX_RelayPlugin::devbot_connected(RenX::Server& in_server, ext_server_info
in_server_info.m_socket->send(version_message.c_str(), version_message.size()); in_server_info.m_socket->send(version_message.c_str(), version_message.size());
} }
void RenX_RelayPlugin::devbot_disconnected(RenX::Server&, ext_server_info& in_server_info) { void RenX_RelayPlugin::upstream_disconnected(RenX::Server&, upstream_server_info& in_server_info) {
in_server_info.m_devbot_connected = false; in_server_info.m_connected = false;
if (in_server_info.m_socket) { if (in_server_info.m_socket) {
in_server_info.m_socket->close(); in_server_info.m_socket->close();
} }
} }
void RenX_RelayPlugin::process_devbot_message(RenX::Server* in_server, const Jupiter::ReadableString& in_line, ext_server_info& in_server_info) { void RenX_RelayPlugin::process_upstream_message(RenX::Server* in_server, const Jupiter::ReadableString& in_line, upstream_server_info& in_server_info) {
if (in_line.isEmpty()) { if (in_line.isEmpty()) {
return; return;
} }

16
src/Plugins/RenX/RenX.Relay/RenX_Relay.h
View File

@ -36,21 +36,23 @@ private:
std::string to_rcon(const std::string_view& rcon_username) const; std::string to_rcon(const std::string_view& rcon_username) const;
}; };
struct ext_server_info { struct upstream_server_info {
std::unique_ptr<Jupiter::TCPSocket> m_socket; std::unique_ptr<Jupiter::TCPSocket> m_socket;
bool m_devbot_connected{}; bool m_connected{};
std::chrono::steady_clock::time_point m_last_connect_attempt{}; std::chrono::steady_clock::time_point m_last_connect_attempt{};
std::chrono::steady_clock::time_point m_last_activity{}; std::chrono::steady_clock::time_point m_last_activity{};
Jupiter::StringL m_last_line; Jupiter::StringL m_last_line;
std::deque<UpstreamCommand> m_response_queue; // also contains real commands std::deque<UpstreamCommand> m_response_queue; // Contains both real & fake commands
bool m_processing_command{}; bool m_processing_command{};
}; };
void devbot_connected(RenX::Server& in_server, ext_server_info& in_server_info); std::string_view get_upstream_name(const upstream_server_info& in_server_info);
void devbot_disconnected(RenX::Server& in_server, ext_server_info& in_server_info);
void process_devbot_message(RenX::Server* in_server, const Jupiter::ReadableString& in_line, ext_server_info& in_server_info);
std::unordered_map<RenX::Server*, ext_server_info> m_server_info_map; void upstream_connected(RenX::Server& in_server, upstream_server_info& in_server_info);
void upstream_disconnected(RenX::Server& in_server, upstream_server_info& in_server_info);
void process_upstream_message(RenX::Server* in_server, const Jupiter::ReadableString& in_line, upstream_server_info& in_server_info);
std::unordered_map<RenX::Server*, upstream_server_info> m_server_info_map;
std::chrono::steady_clock::time_point m_init_time{}; std::chrono::steady_clock::time_point m_init_time{};
std::string m_upstream_hostname; std::string m_upstream_hostname;
uint16_t m_upstream_port; uint16_t m_upstream_port;

Write Preview
Loading…
Cancel
Save