feat: merge backend connections + networks -> WifiNetwork.

Adds NMWirelessManager which merges identical NMWirelessNetworks (groups
of APs with the same SSID) and NMConnectionAdapters (saved connection
settings to wifi networks), and creates WifiNetworks on the frontend.
The manager takes a similar approach to plasma-nm and nm-applet. Adds
utilities to determine a connections security type and a networks best
choice for security, in sync with nm_utils_security_valid from nmcli.

Author: cpwrs

src/network/CMakeLists.txt

@@ -41,7 +41,7 @@ qt_add_dbus_interface(NM_DBUS_INTERFACES
 
 set_source_files_properties(nm/org.freedesktop.NetworkManager.Settings.Connection.xml PROPERTIES
 	CLASSNAME DBusNMConnectionProxy
-	NO_NAMESPACE TRUE
+	INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/nm/dbus_types.hpp
 )
 
 qt_add_dbus_interface(NM_DBUS_INTERFACES
@@ -53,9 +53,11 @@ qt_add_library(quickshell-network STATIC
 	frontend.cpp
 	nm/backend.cpp
 	nm/device.cpp
+	nm/connection.cpp
 	nm/accesspoint.cpp
 	nm/wireless.cpp
-	nm/connection.cpp
+	nm/utils.cpp
+	nm/enums.hpp
 	${NM_DBUS_INTERFACES}
 )
 

src/network/frontend.cpp

@@ -92,9 +92,13 @@ void NetworkWifiDevice::scan() {
 	this->requestScan();
 }
 
-void NetworkWifiDevice::addNetwork(WifiNetwork* network) { mNetworks.insertObject(network); }
+void NetworkWifiDevice::wifiNetworkAdded(WifiNetwork* network) {
+	this->mNetworks.insertObject(network);
+}
 
-void NetworkWifiDevice::removeNetwork(WifiNetwork* network) { mNetworks.removeObject(network); }
+void NetworkWifiDevice::wifiNetworkRemoved(WifiNetwork* network) {
+	this->mNetworks.removeObject(network);
+}
 
 WifiNetwork::WifiNetwork(QObject* parent): QObject(parent) {};
 
@@ -119,6 +123,20 @@ void WifiNetwork::setConnected(bool connected) {
 	}
 }
 
+void WifiNetwork::setNmSecurity(NMWirelessSecurityType::Enum security) {
+	if (this->bNmSecurity != security) {
+		this->bNmSecurity = security;
+		emit this->nmSecurityChanged();
+	}
+}
+
+void WifiNetwork::setKnown(bool known) {
+	if (this->bKnown != known) {
+		this->bKnown = known;
+		emit this->knownChanged();
+	}
+}
+
 Network::Network(QObject* parent): QObject(parent) {
 	// Try each backend
 

src/network/frontend.hpp

@@ -11,45 +11,63 @@
 #include <qtypes.h>
 
 #include "../core/model.hpp"
+#include "nm/enums.hpp"
 
 namespace qs::network {
 
-///! A wifi network
+///! A wifi network represents an available connection or access point on a wireless device.
 class WifiNetwork: public QObject {
 	Q_OBJECT;
 	QML_ELEMENT;
-	QML_UNCREATABLE("Wifi networks can only be acquired through Network");
+	QML_UNCREATABLE("Wifi items can only be acquired through Network");
 	// clang-format off
-	/// The service set identifier of the wifi network
+	/// The SSID (service set identifier) of the wifi network
 	Q_PROPERTY(QString ssid READ default NOTIFY ssidChanged BINDABLE bindableSsid);
 	// The current signal strength of the best access point on the network, in percent.
 	Q_PROPERTY(quint8 signalStrength READ default NOTIFY signalStrengthChanged BINDABLE bindableSignalStrength);
-	/// True if the wireless device is curerntly connected to this wifi network.
+	/// True if the wireless device is currently connected to this wifi network.
 	Q_PROPERTY(bool connected READ default NOTIFY connectedChanged BINDABLE bindableConnected);
+	/// The security type of the wifi network when the backend is NetworkManager. Otherwise NMWirelessSecurityType::Unknown.
+	Q_PROPERTY(NMWirelessSecurityType::Enum nmSecurity READ default NOTIFY nmSecurityChanged BINDABLE bindableNmSecurity);
+	/// True if the wifi network has a known connection profile saved.
+	Q_PROPERTY(bool known READ default NOTIFY knownChanged BINDABLE bindableKnown);
 	// clang-format on
 
 signals:
 	void ssidChanged();
 	void signalStrengthChanged();
 	void connectedChanged();
+	void nmSecurityChanged();
+	void knownChanged();
+	void requestConnect();
 
 public slots:
 	void setSsid(const QString& ssid);
 	void setSignalStrength(quint8 signalStrength);
 	void setConnected(bool connected);
+	void setNmSecurity(NMWirelessSecurityType::Enum security);
+	void setKnown(bool known);
 
 public:
 	explicit WifiNetwork(QObject* parent = nullptr);
 
 	[[nodiscard]] QBindable<QString> bindableSsid() const { return &this->bSsid; };
 	[[nodiscard]] QBindable<quint8> bindableSignalStrength() const { return &this->bSignalStrength; };
 	[[nodiscard]] QBindable<bool> bindableConnected() const { return &this->bConnected; };
+	[[nodiscard]] QBindable<NMWirelessSecurityType::Enum> bindableNmSecurity() const {
+		return &this->bNmSecurity;
+	};
+	[[nodiscard]] QBindable<bool> bindableKnown() const { return &this->bKnown; };
+
+	// Q_INVOKABLE void connect();
 
 private:
 	// clang-format off
 	Q_OBJECT_BINDABLE_PROPERTY(WifiNetwork, QString, bSsid, &WifiNetwork::ssidChanged);
 	Q_OBJECT_BINDABLE_PROPERTY(WifiNetwork, quint8, bSignalStrength, &WifiNetwork::signalStrengthChanged);
 	Q_OBJECT_BINDABLE_PROPERTY(WifiNetwork, bool, bConnected, &WifiNetwork::connectedChanged);
+	Q_OBJECT_BINDABLE_PROPERTY(WifiNetwork, NMWirelessSecurityType::Enum, bNmSecurity, &WifiNetwork::nmSecurityChanged);
+	Q_OBJECT_BINDABLE_PROPERTY(WifiNetwork, bool, bKnown, &WifiNetwork::knownChanged);
 	// clang-format on
 };
 
@@ -160,8 +178,8 @@ class NetworkWifiDevice: public NetworkDevice {
 
 public slots:
 	void scanComplete();
-	void addNetwork(WifiNetwork* network);
-	void removeNetwork(WifiNetwork* network);
+	void wifiNetworkAdded(WifiNetwork* network);
+	void wifiNetworkRemoved(WifiNetwork* network);
 
 public:
 	explicit NetworkWifiDevice(QObject* parent = nullptr);

src/network/nm/accesspoint.cpp

@@ -11,9 +11,27 @@
 #include "../../dbus/properties.hpp"
 #include "nm/dbus_nm_accesspoint.h"
 
-using namespace qs::dbus;
+namespace qs::dbus {
+
+DBusResult<qs::network::NM80211ApFlags::Enum>
+DBusDataTransform<qs::network::NM80211ApFlags::Enum>::fromWire(quint32 wire) {
+	return DBusResult(static_cast<qs::network::NM80211ApFlags::Enum>(wire));
+}
+
+DBusResult<qs::network::NM80211ApSecurityFlags::Enum>
+DBusDataTransform<qs::network::NM80211ApSecurityFlags::Enum>::fromWire(quint32 wire) {
+	return DBusResult(static_cast<qs::network::NM80211ApSecurityFlags::Enum>(wire));
+}
+
+DBusResult<qs::network::NM80211Mode::Enum>
+DBusDataTransform<qs::network::NM80211Mode::Enum>::fromWire(quint32 wire) {
+	return DBusResult(static_cast<qs::network::NM80211Mode::Enum>(wire));
+}
+
+} // namespace qs::dbus
 
 namespace qs::network {
+using namespace qs::dbus;
 
 namespace {
 Q_LOGGING_CATEGORY(logNetworkManager, "quickshell.network.networkmanager", QtWarningMsg);
@@ -32,6 +50,14 @@ NMAccessPointAdapter::NMAccessPointAdapter(const QString& path, QObject* parent)
 		return;
 	}
 
+	QObject::connect(
+	    &this->accessPointProperties,
+	    &DBusPropertyGroup::getAllFinished,
+	    this,
+	    [this]() { emit this->ready(); },
+	    Qt::SingleShotConnection
+	);
+
 	this->accessPointProperties.setInterface(this->proxy);
 	this->accessPointProperties.updateAllViaGetAll();
 }
@@ -42,55 +68,4 @@ QString NMAccessPointAdapter::address() const {
 }
 QString NMAccessPointAdapter::path() const { return this->proxy ? this->proxy->path() : QString(); }
 
-NMWifiNetwork::NMWifiNetwork(QByteArray ssid, QObject* parent)
-    : QObject(parent)
-    , mSsid(std::move(ssid)) {}
-
-void NMWifiNetwork::updateSignalStrength() {
-	quint8 max = 0;
-	for (auto* ap: mAccessPoints) {
-		max = qMax(max, ap->getSignal());
-	}
-	if (this->bMaxSignal != max) {
-		this->bMaxSignal = max;
-	}
-}
-
-void NMWifiNetwork::addAccessPoint(NMAccessPointAdapter* ap) {
-	if (this->mAccessPoints.contains(ap)) {
-		qCWarning(logNetworkManager) << "Access point" << ap->path() << "was already in AP group";
-		return;
-	}
-
-	this->mAccessPoints.append(ap);
-	QObject::connect(
-	    ap,
-	    &NMAccessPointAdapter::signalStrengthChanged,
-	    this,
-	    &NMWifiNetwork::updateSignalStrength
-	);
-	this->updateSignalStrength();
-}
-
-void NMWifiNetwork::removeAccessPoint(NMAccessPointAdapter* ap) {
-	if (mAccessPoints.removeOne(ap)) {
-		QObject::disconnect(ap, nullptr, this, nullptr);
-		this->updateSignalStrength();
-	}
-}
-
 } // namespace qs::network
-
-namespace qs::dbus {
-
-DBusResult<qs::network::NM80211ApFlags::Enum>
-DBusDataTransform<qs::network::NM80211ApFlags::Enum>::fromWire(quint32 wire) {
-	return DBusResult(static_cast<qs::network::NM80211ApFlags::Enum>(wire));
-}
-
-DBusResult<qs::network::NM80211ApSecurityFlags::Enum>
-DBusDataTransform<qs::network::NM80211ApSecurityFlags::Enum>::fromWire(quint32 wire) {
-	return DBusResult(static_cast<qs::network::NM80211ApSecurityFlags::Enum>(wire));
-}
-
-} // namespace qs::dbus

src/network/nm/accesspoint.hpp

@@ -11,50 +11,9 @@
 #include <qtypes.h>
 
 #include "../../dbus/properties.hpp"
+#include "enums.hpp"
 #include "nm/dbus_nm_accesspoint.h"
 
-namespace qs::network {
-
-class NM80211ApFlags: public QObject {
-	Q_OBJECT;
-
-public:
-	enum Enum : quint8 {
-		None = 0,
-		Privacy = 1,
-		Wps = 2,
-		WpsPbc = 4,
-		WpsPin = 8,
-	};
-	Q_ENUM(Enum);
-};
-
-class NM80211ApSecurityFlags: public QObject {
-	Q_OBJECT;
-
-public:
-	enum Enum : quint16 {
-		None = 0,
-		PairWep40 = 1,
-		PairWep104 = 2,
-		PairTkip = 4,
-		PairCcmp = 8,
-		GroupWep40 = 16,
-		GroupWep104 = 32,
-		GroupTkip = 64,
-		GroupCcmp = 128,
-		KeyMgmtPsk = 256,
-		KeyMgmt8021x = 512,
-		KeyMgmtSae = 1024,
-		KeyMgmtOwe = 2048,
-		KeyMgmtOweTm = 4096,
-		KeyMgmtEapSuiteB192 = 8192,
-	};
-	Q_ENUM(Enum);
-};
-
-} // namespace qs::network
-
 namespace qs::dbus {
 
 template <>
@@ -71,6 +30,13 @@ struct DBusDataTransform<qs::network::NM80211ApSecurityFlags::Enum> {
 	static DBusResult<Data> fromWire(Wire wire);
 };
 
+template <>
+struct DBusDataTransform<qs::network::NM80211Mode::Enum> {
+	using Wire = quint32;
+	using Data = qs::network::NM80211Mode::Enum;
+	static DBusResult<Data> fromWire(Wire wire);
+};
+
 } // namespace qs::dbus
 
 namespace qs::network {
@@ -86,14 +52,21 @@ class NMAccessPointAdapter: public QObject {
 	[[nodiscard]] bool isValid() const;
 	[[nodiscard]] QString path() const;
 	[[nodiscard]] QString address() const;
-	[[nodiscard]] quint8 getSignal() const { return this->bSignalStrength; };
+	[[nodiscard]] QByteArray ssid() const { return this->bSsid; };
+	[[nodiscard]] quint8 signalStrength() const { return this->bSignalStrength; };
+	[[nodiscard]] NM80211ApFlags::Enum flags() const { return this->bFlags; };
+	[[nodiscard]] NM80211ApSecurityFlags::Enum wpaFlags() const { return this->bWpaFlags; };
+	[[nodiscard]] NM80211ApSecurityFlags::Enum rsnFlags() const { return this->bRsnFlags; };
+	[[nodiscard]] NM80211Mode::Enum mode() const { return this->bMode; };
 
 signals:
 	void ssidChanged(const QByteArray& ssid);
 	void signalStrengthChanged(quint8 signal);
 	void wpaFlagsChanged(NM80211ApSecurityFlags::Enum wpaFlags);
 	void rsnFlagsChanged(NM80211ApSecurityFlags::Enum rsnFlags);
 	void flagsChanged(NM80211ApFlags::Enum flags);
+	void modeChanged(NM80211Mode::Enum mode);
+	void ready();
 
 private:
 	// clang-format off
@@ -102,40 +75,18 @@ class NMAccessPointAdapter: public QObject {
 	Q_OBJECT_BINDABLE_PROPERTY(NMAccessPointAdapter, NM80211ApFlags::Enum, bFlags, &NMAccessPointAdapter::flagsChanged);
 	Q_OBJECT_BINDABLE_PROPERTY(NMAccessPointAdapter, NM80211ApSecurityFlags::Enum, bWpaFlags, &NMAccessPointAdapter::wpaFlagsChanged);
 	Q_OBJECT_BINDABLE_PROPERTY(NMAccessPointAdapter, NM80211ApSecurityFlags::Enum, bRsnFlags, &NMAccessPointAdapter::rsnFlagsChanged);
+	Q_OBJECT_BINDABLE_PROPERTY(NMAccessPointAdapter, NM80211Mode::Enum, bMode, &NMAccessPointAdapter::modeChanged);
 
 	QS_DBUS_BINDABLE_PROPERTY_GROUP(NMAccessPointAdapter, accessPointProperties);
 	QS_DBUS_PROPERTY_BINDING(NMAccessPointAdapter, pSsid, bSsid, accessPointProperties, "Ssid");
 	QS_DBUS_PROPERTY_BINDING(NMAccessPointAdapter, pSignalStrength, bSignalStrength, accessPointProperties, "Strength");
 	QS_DBUS_PROPERTY_BINDING(NMAccessPointAdapter, pFlags, bFlags, accessPointProperties, "Flags");
 	QS_DBUS_PROPERTY_BINDING(NMAccessPointAdapter, pWpaFlags, bWpaFlags, accessPointProperties, "WpaFlags");
 	QS_DBUS_PROPERTY_BINDING(NMAccessPointAdapter, pRsnFlags, bRsnFlags, accessPointProperties, "RsnFlags");
+	QS_DBUS_PROPERTY_BINDING(NMAccessPointAdapter, pMode, bMode, accessPointProperties, "Mode");
 	// clang-format on
 
 	DBusNMAccessPointProxy* proxy = nullptr;
 };
 
-// NMWifiNetwork represents a wireless network, which aggregates all access points with
-// the same SSID. It also provides signals and slots for a frontend WifiNetwork.
-class NMWifiNetwork: public QObject {
-	Q_OBJECT;
-
-public:
-	explicit NMWifiNetwork(QByteArray ssid, QObject* parent = nullptr);
-	void addAccessPoint(NMAccessPointAdapter* ap);
-	void removeAccessPoint(NMAccessPointAdapter* ap);
-	void updateSignalStrength();
-	[[nodiscard]] bool isEmpty() const { return this->mAccessPoints.isEmpty(); };
-
-signals:
-	void signalStrengthChanged(quint8 signal);
-
-private:
-	QList<NMAccessPointAdapter*> mAccessPoints;
-	QByteArray mSsid;
-
-	// clang-format off
-	Q_OBJECT_BINDABLE_PROPERTY(NMWifiNetwork, quint8, bMaxSignal, &NMWifiNetwork::signalStrengthChanged);
-	// clang-format on
-};
-
 } // namespace qs::network