fix: ignore late pings (#5457)

This commit is contained in:
nerix
2024-06-16 11:34:00 +02:00
committed by GitHub
parent 538bead45b
commit 86871eec5a
3 changed files with 28 additions and 1 deletions
+24 -1
View File
@@ -3,6 +3,10 @@
#include "common/QLogging.hpp"
#include "common/Version.hpp"
#include <chrono>
using namespace std::chrono_literals;
namespace chatterino {
namespace {
@@ -56,6 +60,7 @@ IrcConnection::IrcConnection(QObject *parent)
// Send ping every x seconds
this->pingTimer_.setInterval(5000);
this->pingTimer_.start();
this->lastPing_ = std::chrono::system_clock::now();
QObject::connect(&this->pingTimer_, &QTimer::timeout, [this] {
if (this->isConnected())
{
@@ -64,7 +69,25 @@ IrcConnection::IrcConnection(QObject *parent)
// If we're still receiving messages, all is well
this->recentlyReceivedMessage_ = false;
this->waitingForPong_ = false;
this->heartbeat.invoke();
// Check if we got invoked too late (e.g. due to a sleep)
auto now = std::chrono::system_clock::now();
auto elapsed = now - this->lastPing_;
if (elapsed < 3 * 5000ms)
{
this->heartbeat.invoke();
}
else
{
qCDebug(chatterinoIrc).nospace()
<< "Got late ping (skipping heartbeat): "
<< std::chrono::duration_cast<
std::chrono::milliseconds>(elapsed)
.count()
<< "ms";
}
this->lastPing_ = now;
return;
}
+3
View File
@@ -6,6 +6,8 @@
#include <pajlada/signals/signal.hpp>
#include <QTimer>
#include <chrono>
namespace chatterino {
class IrcConnection : public Communi::IrcConnection
@@ -33,6 +35,7 @@ private:
QTimer pingTimer_;
QTimer reconnectTimer_;
std::atomic<bool> recentlyReceivedMessage_{true};
std::chrono::time_point<std::chrono::system_clock> lastPing_;
// Reconnect with a base delay of 1 second and max out at 1 second * (2^(5-1)) (i.e. 16 seconds)
ExponentialBackoff<5> reconnectBackoff_{std::chrono::milliseconds{1000}};