-
Notifications
You must be signed in to change notification settings - Fork 41
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
qml: Add PeerDetails page #387
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
// Copyright (c) 2024 The Bitcoin Core developers | ||
// Distributed under the MIT software license, see the accompanying | ||
// file COPYING or http://www.opensource.org/licenses/mit-license.php. | ||
|
||
#include <qml/models/peerdetailsmodel.h> | ||
|
||
PeerDetailsModel::PeerDetailsModel(CNodeCombinedStats* nodeStats, PeerTableModel* parent) | ||
: m_combinedStats{nodeStats} | ||
, m_model{parent} | ||
, m_disconnected{false} | ||
{ | ||
for (int row = 0; row < m_model->rowCount(); ++row) { | ||
QModelIndex index = m_model->index(row, 0); | ||
int nodeIdInRow = m_model->data(index, PeerTableModel::NetNodeId).toInt(); | ||
if (nodeIdInRow == m_combinedStats->nodeStats.nodeid) { | ||
m_row = row; | ||
break; | ||
} | ||
} | ||
connect(parent, &PeerTableModel::rowsRemoved, this, &PeerDetailsModel::onModelRowsRemoved); | ||
connect(parent, &PeerTableModel::dataChanged, this, &PeerDetailsModel::onModelDataChanged); | ||
} | ||
|
||
void PeerDetailsModel::onModelRowsRemoved(const QModelIndex& parent, int first, int last) | ||
{ | ||
for (int row = first; row <= last; ++row) { | ||
QModelIndex index = m_model->index(row, 0, parent); | ||
int nodeIdInRow = m_model->data(index, PeerTableModel::NetNodeId).toInt(); | ||
if (nodeIdInRow == this->nodeId()) { | ||
if (!m_disconnected) { | ||
m_disconnected = true; | ||
Q_EMIT disconnected(); | ||
} | ||
break; | ||
} | ||
} | ||
} | ||
|
||
void PeerDetailsModel::onModelDataChanged(const QModelIndex& /* top_left */, const QModelIndex& /* bottom_right */) | ||
{ | ||
if (m_model->data(m_model->index(m_row, 0), PeerTableModel::NetNodeId).isNull() || | ||
m_model->data(m_model->index(m_row, 0), PeerTableModel::NetNodeId).toInt() != nodeId()) { | ||
if (!m_disconnected) { | ||
m_disconnected = true; | ||
Q_EMIT disconnected(); | ||
} | ||
return; | ||
} | ||
|
||
m_combinedStats = m_model->data(m_model->index(m_row, 0), PeerTableModel::StatsRole).value<CNodeCombinedStats*>(); | ||
|
||
// Only update when all information is available | ||
if (m_combinedStats && m_combinedStats->fNodeStateStatsAvailable) { | ||
Q_EMIT dataChanged(); | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,95 @@ | ||
// Copyright (c) 2024 The Bitcoin Core developers | ||
// Distributed under the MIT software license, see the accompanying | ||
// file COPYING or http://www.opensource.org/licenses/mit-license.php. | ||
|
||
#ifndef BITCOIN_QML_MODELS_PEERDETAILSMODEL_H | ||
#define BITCOIN_QML_MODELS_PEERDETAILSMODEL_H | ||
|
||
#include <QObject> | ||
|
||
#include <qt/guiutil.h> | ||
#include <qt/peertablemodel.h> | ||
#include <qt/rpcconsole.h> | ||
#include <util/time.h> | ||
|
||
class PeerDetailsModel : public QObject | ||
{ | ||
Q_OBJECT | ||
Q_PROPERTY(int nodeId READ nodeId NOTIFY dataChanged) | ||
Q_PROPERTY(QString address READ address NOTIFY dataChanged) | ||
Q_PROPERTY(QString addressLocal READ addressLocal NOTIFY dataChanged) | ||
Q_PROPERTY(QString type READ type NOTIFY dataChanged) | ||
Q_PROPERTY(QString version READ version NOTIFY dataChanged) | ||
Q_PROPERTY(QString userAgent READ userAgent NOTIFY dataChanged) | ||
Q_PROPERTY(QString services READ services NOTIFY dataChanged) | ||
Q_PROPERTY(bool transactionRelay READ transactionRelay NOTIFY dataChanged) | ||
Q_PROPERTY(bool addressRelay READ addressRelay NOTIFY dataChanged) | ||
Q_PROPERTY(QString startingHeight READ startingHeight NOTIFY dataChanged) | ||
Q_PROPERTY(QString syncedHeaders READ syncedHeaders NOTIFY dataChanged) | ||
Q_PROPERTY(QString syncedBlocks READ syncedBlocks NOTIFY dataChanged) | ||
Q_PROPERTY(QString direction READ direction NOTIFY dataChanged) | ||
Q_PROPERTY(QString connectionDuration READ connectionDuration NOTIFY dataChanged) | ||
Q_PROPERTY(QString lastSend READ lastSend NOTIFY dataChanged) | ||
Q_PROPERTY(QString lastReceived READ lastReceived NOTIFY dataChanged) | ||
Q_PROPERTY(QString bytesSent READ bytesSent NOTIFY dataChanged) | ||
Q_PROPERTY(QString bytesReceived READ bytesReceived NOTIFY dataChanged) | ||
Q_PROPERTY(QString pingTime READ pingTime NOTIFY dataChanged) | ||
Q_PROPERTY(QString pingWait READ pingWait NOTIFY dataChanged) | ||
Q_PROPERTY(QString pingMin READ pingMin NOTIFY dataChanged) | ||
Q_PROPERTY(QString timeOffset READ timeOffset NOTIFY dataChanged) | ||
Q_PROPERTY(QString mappedAS READ mappedAS NOTIFY dataChanged) | ||
Q_PROPERTY(QString permission READ permission NOTIFY dataChanged) | ||
|
||
public: | ||
explicit PeerDetailsModel(CNodeCombinedStats* nodeStats, PeerTableModel* model); | ||
|
||
int nodeId() const { return m_combinedStats->nodeStats.nodeid; } | ||
QString address() const { return QString::fromStdString(m_combinedStats->nodeStats.m_addr_name); } | ||
QString addressLocal() const { return QString::fromStdString(m_combinedStats->nodeStats.addrLocal); } | ||
QString type() const { return GUIUtil::ConnectionTypeToQString(m_combinedStats->nodeStats.m_conn_type, /*prepend_direction=*/true); } | ||
QString version() const { return QString::number(m_combinedStats->nodeStats.nVersion); } | ||
QString userAgent() const { return QString::fromStdString(m_combinedStats->nodeStats.cleanSubVer); } | ||
QString services() const { return GUIUtil::formatServicesStr(m_combinedStats->nodeStateStats.their_services); } | ||
bool transactionRelay() const { return m_combinedStats->nodeStateStats.m_relay_txs; } | ||
bool addressRelay() const { return m_combinedStats->nodeStateStats.m_addr_relay_enabled; } | ||
QString startingHeight() const { return QString::number(m_combinedStats->nodeStateStats.m_starting_height); } | ||
QString syncedHeaders() const { return QString::number(m_combinedStats->nodeStateStats.nSyncHeight); } | ||
QString syncedBlocks() const { return QString::number(m_combinedStats->nodeStateStats.nCommonHeight); } | ||
QString direction() const { return QString::fromStdString(m_combinedStats->nodeStats.fInbound ? "Inbound" : "Outbound"); } | ||
QString connectionDuration() const { return GUIUtil::formatDurationStr(GetTime<std::chrono::seconds>() - m_combinedStats->nodeStats.m_connected); } | ||
QString lastSend() const { return GUIUtil::formatDurationStr(GetTime<std::chrono::seconds>() - m_combinedStats->nodeStats.m_last_send); } | ||
QString lastReceived() const { return GUIUtil::formatDurationStr(GetTime<std::chrono::seconds>() - m_combinedStats->nodeStats.m_last_recv); } | ||
QString bytesSent() const { return GUIUtil::formatBytes(m_combinedStats->nodeStats.nSendBytes); } | ||
QString bytesReceived() const { return GUIUtil::formatBytes(m_combinedStats->nodeStats.nRecvBytes); } | ||
QString pingTime() const { return GUIUtil::formatPingTime(m_combinedStats->nodeStats.m_last_ping_time); } | ||
QString pingMin() const { return GUIUtil::formatPingTime(m_combinedStats->nodeStats.m_min_ping_time); } | ||
QString pingWait() const { return GUIUtil::formatPingTime(m_combinedStats->nodeStateStats.m_ping_wait); } | ||
QString timeOffset() const { return GUIUtil::formatTimeOffset(m_combinedStats->nodeStats.nTimeOffset); } | ||
QString mappedAS() const { return m_combinedStats->nodeStats.m_mapped_as != 0 ? QString::number(m_combinedStats->nodeStats.m_mapped_as) : tr("N/A"); } | ||
QString permission() const { | ||
if (m_combinedStats->nodeStats.m_permission_flags == NetPermissionFlags::None) { | ||
return tr("N/A"); | ||
} | ||
QStringList permissions; | ||
for (const auto& permission : NetPermissions::ToStrings(m_combinedStats->nodeStats.m_permission_flags)) { | ||
permissions.append(QString::fromStdString(permission)); | ||
} | ||
return permissions.join(" & "); | ||
} | ||
|
||
Q_SIGNALS: | ||
void dataChanged(); | ||
void disconnected(); | ||
|
||
private Q_SLOTS: | ||
void onModelRowsRemoved(const QModelIndex& parent, int first, int last); | ||
void onModelDataChanged(const QModelIndex& top_left, const QModelIndex& bottom_right); | ||
|
||
private: | ||
int m_row; | ||
CNodeCombinedStats* m_combinedStats; | ||
PeerTableModel* m_model; | ||
bool m_disconnected; | ||
}; | ||
|
||
#endif // BITCOIN_QML_MODELS_PEERDETAILSMODEL_H |
Original file line number | Diff line number | Diff line change | ||||||||
---|---|---|---|---|---|---|---|---|---|---|
@@ -0,0 +1,137 @@ | ||||||||||
// Copyright (c) 2024 The Bitcoin Core developers | ||||||||||
// Distributed under the MIT software license, see the accompanying | ||||||||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php. | ||||||||||
|
||||||||||
import QtQuick 2.15 | ||||||||||
import QtQuick.Controls 2.15 | ||||||||||
import QtQuick.Layouts 1.15 | ||||||||||
import org.bitcoincore.qt 1.0 | ||||||||||
import "../../controls" | ||||||||||
import "../../components" | ||||||||||
|
||||||||||
Page { | ||||||||||
signal backClicked() | ||||||||||
|
||||||||||
property PeerDetailsModel details | ||||||||||
|
||||||||||
Connections { | ||||||||||
target: details | ||||||||||
function onDisconnected() { | ||||||||||
root.backClicked() | ||||||||||
} | ||||||||||
} | ||||||||||
|
||||||||||
id: root | ||||||||||
background: null | ||||||||||
|
||||||||||
header: NavigationBar2 { | ||||||||||
leftItem: NavButton { | ||||||||||
iconSource: "image://images/caret-left" | ||||||||||
text: qsTr("Back") | ||||||||||
onClicked: root.backClicked() | ||||||||||
} | ||||||||||
centerItem: Header { | ||||||||||
headerBold: true | ||||||||||
headerSize: 18 | ||||||||||
header: qsTr("Peer " + details.nodeId) | ||||||||||
} | ||||||||||
} | ||||||||||
|
||||||||||
component PeerKeyValueRow: Row { | ||||||||||
width: parent.width | ||||||||||
property string key: "" | ||||||||||
property string value: "" | ||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. also
Suggested change
|
||||||||||
height: 21 * valueText.lineCount | ||||||||||
spacing: 10 | ||||||||||
CoreText { | ||||||||||
color: Theme.color.neutral9; | ||||||||||
text: key; | ||||||||||
width: 125; | ||||||||||
horizontalAlignment: Qt.AlignLeft; | ||||||||||
} | ||||||||||
CoreText { | ||||||||||
id: valueText | ||||||||||
color: Theme.color.neutral9; | ||||||||||
elide: Text.ElideRight; | ||||||||||
wrapMode: Text.WordWrap; | ||||||||||
text: value | ||||||||||
width: parent.width - 125; | ||||||||||
horizontalAlignment: Qt.AlignLeft; | ||||||||||
} | ||||||||||
} | ||||||||||
|
||||||||||
ScrollView { | ||||||||||
id: scrollView | ||||||||||
width: parent.width | ||||||||||
height: parent.height | ||||||||||
clip: true | ||||||||||
contentWidth: width | ||||||||||
|
||||||||||
Column { | ||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. i think a max width with an elipses should cover it. I'll see what that looks like. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. values now elide There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. user might want to view all Services There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. also things like onion address should be fully visible imo |
||||||||||
width: Math.min(parent.width - 40, 450) | ||||||||||
anchors.horizontalCenter: parent.horizontalCenter | ||||||||||
spacing: 10 | ||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. we want to add top and bottom padding of 30 to adhere to the design file
Suggested change
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||||||||||
topPadding: 30 | ||||||||||
bottomPadding: 30 | ||||||||||
|
||||||||||
CoreText { | ||||||||||
text: "Information"; | ||||||||||
bold: true; | ||||||||||
font.pixelSize: 18; | ||||||||||
horizontalAlignment: Qt.AlignLeft; | ||||||||||
color: Theme.color.neutral9; | ||||||||||
} | ||||||||||
Column { | ||||||||||
width: parent.width | ||||||||||
bottomPadding: 5 | ||||||||||
PeerKeyValueRow { key: qsTr("Address"); value: details.address } | ||||||||||
PeerKeyValueRow { key: qsTr("VIA"); value: details.addressLocal } | ||||||||||
PeerKeyValueRow { key: qsTr("Type"); value: details.type } | ||||||||||
PeerKeyValueRow { key: qsTr("Permissions"); value: details.permission } | ||||||||||
PeerKeyValueRow { key: qsTr("Version"); value: details.version } | ||||||||||
PeerKeyValueRow { key: qsTr("User agent"); value: details.userAgent } | ||||||||||
PeerKeyValueRow { key: qsTr("Services"); value: details.services } | ||||||||||
PeerKeyValueRow { key: qsTr("Transaction relay"); value: details.transactionRelay } | ||||||||||
PeerKeyValueRow { key: qsTr("Address relay"); value: details.addressRelay } | ||||||||||
PeerKeyValueRow { key: qsTr("Mapped AS"); value: details.mappedAS } | ||||||||||
} | ||||||||||
|
||||||||||
CoreText { | ||||||||||
text: "Block data"; | ||||||||||
bold: true; | ||||||||||
font.pixelSize: 18; | ||||||||||
horizontalAlignment: Qt.AlignLeft; | ||||||||||
color: Theme.color.neutral9; | ||||||||||
} | ||||||||||
Column { | ||||||||||
width: parent.width | ||||||||||
bottomPadding: 5 | ||||||||||
PeerKeyValueRow { key: qsTr("Starting block"); value: details.startingHeight } | ||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I noticed that the Qt gui uses a value from a different struct. I will switch to that and see if that resolves it. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. yes it works now |
||||||||||
PeerKeyValueRow { key: qsTr("Synced headers"); value: details.syncedHeaders } | ||||||||||
PeerKeyValueRow { key: qsTr("Synced blocks"); value: details.syncedBlocks } | ||||||||||
} | ||||||||||
|
||||||||||
CoreText { | ||||||||||
text: "Network traffic"; | ||||||||||
bold: true; | ||||||||||
font.pixelSize: 18; | ||||||||||
horizontalAlignment: Qt.AlignLeft; | ||||||||||
color: Theme.color.neutral9; | ||||||||||
} | ||||||||||
Column { | ||||||||||
width: parent.width | ||||||||||
bottomPadding: 5 | ||||||||||
PeerKeyValueRow { key: qsTr("Direction"); value: details.direction } | ||||||||||
PeerKeyValueRow { key: qsTr("Connection time"); value: details.connectionDuration } | ||||||||||
PeerKeyValueRow { key: qsTr("Last send"); value: details.lastSend } | ||||||||||
PeerKeyValueRow { key: qsTr("Last receive"); value: details.lastReceived } | ||||||||||
PeerKeyValueRow { key: qsTr("Sent"); value: details.bytesSent } | ||||||||||
PeerKeyValueRow { key: qsTr("Received"); value: details.bytesReceived } | ||||||||||
PeerKeyValueRow { key: qsTr("Ping time"); value: details.pingTime } | ||||||||||
PeerKeyValueRow { key: qsTr("Ping wait"); value: details.pingWait } | ||||||||||
PeerKeyValueRow { key: qsTr("Min ping"); value: details.pingMin } | ||||||||||
PeerKeyValueRow { key: qsTr("Time offset"); value: details.timeOffset } | ||||||||||
} | ||||||||||
} | ||||||||||
} | ||||||||||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
for reviewers: https://doc.qt.io/qt-6/qqmlengine.html#qmlRegisterUncreatableType