RMG: show ping in netplay dialogs

Rosalie241 · Jan 29, 2025 · 9dc2506 · 9dc2506
1 parent 80d6d8a
commit 9dc2506
Show file tree

Hide file tree

Showing 6 changed files with 104 additions and 0 deletions.
diff --git a/Source/RMG/UserInterface/Dialog/Netplay/CreateNetplaySessionDialog.cpp b/Source/RMG/UserInterface/Dialog/Netplay/CreateNetplaySessionDialog.cpp
@@ -37,6 +37,7 @@ CreateNetplaySessionDialog::CreateNetplaySessionDialog(QWidget *parent, QWebSock
     // prepare web socket
     this->webSocket = webSocket;
     connect(this->webSocket, &QWebSocket::textMessageReceived, this, &CreateNetplaySessionDialog::on_webSocket_textMessageReceived);
+    connect(this->webSocket, &QWebSocket::pong, this, &CreateNetplaySessionDialog::on_webSocket_pong);
 
     // prepare broadcast
     broadcastSocket.bind(QHostAddress(QHostAddress::AnyIPv4), 0);
@@ -83,6 +84,8 @@ CreateNetplaySessionDialog::CreateNetplaySessionDialog(QWidget *parent, QWebSock
         networkAccessManager->setTransferTimeout(15000);
         networkAccessManager->get(QNetworkRequest(QUrl(serverUrl)));
     }
+
+    this->pingTimerId = this->startTimer(2000);
 }
 
 CreateNetplaySessionDialog::~CreateNetplaySessionDialog(void)
@@ -153,6 +156,17 @@ void CreateNetplaySessionDialog::validateCreateButton(void)
     createButton->setEnabled(this->validate());
 }
 
+void CreateNetplaySessionDialog::timerEvent(QTimerEvent* event)
+{
+    if (event->timerId() == this->pingTimerId)
+    {
+        if (this->webSocket->isValid())
+        {
+            this->webSocket->ping();
+        }
+    }
+}
+
 void CreateNetplaySessionDialog::on_webSocket_textMessageReceived(QString message)
 {
     QJsonDocument jsonDocument = QJsonDocument::fromJson(message.toUtf8());
@@ -173,6 +187,11 @@ void CreateNetplaySessionDialog::on_webSocket_textMessageReceived(QString messag
     }
 }
 
+void CreateNetplaySessionDialog::on_webSocket_pong(quint64 elapsedTime, const QByteArray&)
+{
+    this->pingLineEdit->setText(QString::number(elapsedTime) + " ms");
+}
+
 void CreateNetplaySessionDialog::on_broadcastSocket_readyRead()
 {
     while (this->broadcastSocket.hasPendingDatagrams())
@@ -222,6 +241,8 @@ void CreateNetplaySessionDialog::on_serverComboBox_currentIndexChanged(int index
         return;
     }
 
+    this->pingLineEdit->setText("Calculating...");
+
     QString address = this->serverComboBox->itemData(index).toString();
     this->webSocket->open(QUrl(address));
 }

diff --git a/Source/RMG/UserInterface/Dialog/Netplay/CreateNetplaySessionDialog.hpp b/Source/RMG/UserInterface/Dialog/Netplay/CreateNetplaySessionDialog.hpp
@@ -12,6 +12,7 @@
 
 #include <QNetworkReply>
 #include <QJsonObject>
+#include <QTimerEvent>
 #include <QWebSocket>
 #include <QUdpSocket>
 #include <QDialog>
@@ -40,6 +41,8 @@ class CreateNetplaySessionDialog : public QDialog, private Ui::CreateNetplaySess
   	QWebSocket* webSocket;
     QUdpSocket broadcastSocket;
 
+    int pingTimerId = -1;
+
   	QJsonObject sessionJson;
     QString sessionFile;
 
@@ -48,8 +51,12 @@ class CreateNetplaySessionDialog : public QDialog, private Ui::CreateNetplaySess
     bool validate(void);
     void validateCreateButton(void);
 
+  protected:
+    void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE;
+
   private slots:
   	void on_webSocket_textMessageReceived(QString message);
+    void on_webSocket_pong(quint64 elapsedTime, const QByteArray&);
     void on_broadcastSocket_readyRead(void);
     void on_networkAccessManager_Finished(QNetworkReply* reply);
 

diff --git a/Source/RMG/UserInterface/Dialog/Netplay/CreateNetplaySessionDialog.ui b/Source/RMG/UserInterface/Dialog/Netplay/CreateNetplaySessionDialog.ui
@@ -28,6 +28,30 @@
      </item>
     </layout>
    </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_5">
+     <item>
+      <widget class="QLabel" name="label_5">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Server ping</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="pingLineEdit">
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_4">
      <item>

diff --git a/Source/RMG/UserInterface/Dialog/Netplay/NetplaySessionBrowserDialog.cpp b/Source/RMG/UserInterface/Dialog/Netplay/NetplaySessionBrowserDialog.cpp
@@ -40,6 +40,7 @@ NetplaySessionBrowserDialog::NetplaySessionBrowserDialog(QWidget *parent, QWebSo
     connect(this->webSocket, &QWebSocket::connected, this, &NetplaySessionBrowserDialog::on_webSocket_connected);
     connect(this->webSocket, &QWebSocket::disconnected, this, &NetplaySessionBrowserDialog::on_webSocket_disconnected);
     connect(this->webSocket, &QWebSocket::textMessageReceived, this, &NetplaySessionBrowserDialog::on_webSocket_textMessageReceived);
+    connect(this->webSocket, &QWebSocket::pong, this, &NetplaySessionBrowserDialog::on_webSocket_pong);
 
     // copy rom data for later
     this->romData = modelData;
@@ -78,6 +79,8 @@ NetplaySessionBrowserDialog::NetplaySessionBrowserDialog(QWidget *parent, QWebSo
     }
 
     this->validateJoinButton();
+
+    this->pingTimerId = this->startTimer(2000);
 }
 
 NetplaySessionBrowserDialog::~NetplaySessionBrowserDialog(void)
@@ -158,6 +161,17 @@ void NetplaySessionBrowserDialog::validateJoinButton(void)
     joinButton->setEnabled(this->validate());
 }
 
+void NetplaySessionBrowserDialog::timerEvent(QTimerEvent *event)
+{
+    if (event->timerId() == this->pingTimerId)
+    {
+        if (this->webSocket->isValid())
+        {
+            this->webSocket->ping();
+        }
+    }
+}
+
 void NetplaySessionBrowserDialog::on_webSocket_connected(void)
 {
     if (!this->webSocket->isValid())
@@ -241,6 +255,11 @@ void NetplaySessionBrowserDialog::on_webSocket_textMessageReceived(QString messa
     }
 }
 
+void NetplaySessionBrowserDialog::on_webSocket_pong(quint64 elapsedTime, const QByteArray&)
+{
+    this->pingLineEdit->setText(QString::number(elapsedTime) + " ms");
+}
+
 void NetplaySessionBrowserDialog::on_webSocket_disconnected()
 {
     this->sessionBrowserWidget->Reset();
@@ -299,6 +318,8 @@ void NetplaySessionBrowserDialog::on_serverComboBox_currentIndexChanged(int inde
         return;
     }
 
+    this->pingLineEdit->setText("Calculating...");
+
     this->sessionBrowserWidget->StartRefresh();
 
     QString address = this->serverComboBox->itemData(index).toString();

diff --git a/Source/RMG/UserInterface/Dialog/Netplay/NetplaySessionBrowserDialog.hpp b/Source/RMG/UserInterface/Dialog/Netplay/NetplaySessionBrowserDialog.hpp
@@ -12,6 +12,7 @@
 
 #include <QTableWidgetItem>
 #include <QNetworkReply>
+#include <QTimerEvent>
 #include <QJsonObject>
 #include <QWebSocket>
 #include <QUdpSocket>
@@ -44,14 +45,20 @@ class NetplaySessionBrowserDialog : public QDialog, private Ui::NetplaySessionBr
     QString sessionFile;
     QMap<QString, CoreRomSettings> romData;
 
+    int pingTimerId = -1;
+
     QString showROMDialog(QString name, QString md5);
 
     bool validate(void);
     void validateJoinButton(void);
 
+  protected:
+    void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE;
+
   private slots:
     void on_webSocket_connected(void);
     void on_webSocket_textMessageReceived(QString message);
+    void on_webSocket_pong(quint64 elapsedTime, const QByteArray&);
     void on_webSocket_disconnected(void);
 
     void on_broadcastSocket_readyRead(void);

diff --git a/Source/RMG/UserInterface/Dialog/Netplay/NetplaySessionBrowserDialog.ui b/Source/RMG/UserInterface/Dialog/Netplay/NetplaySessionBrowserDialog.ui
@@ -49,6 +49,30 @@
      </item>
     </layout>
    </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <widget class="QLabel" name="label_2">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Server ping</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="pingLineEdit">
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
    <item>
     <widget class="UserInterface::Widget::NetplaySessionBrowserWidget" name="sessionBrowserWidget">
      <property name="sizePolicy">