network: add WifiScanner

- Add WifiScanner to replace requestScan in API
- Implement NM scanner that avoids rate limit
- Add conditional visibility to networks based on scanner state
- Add gates to backend-specific props in the manual test

Author: cpwrs

src/network/device.cpp

@@ -31,6 +31,27 @@ QString DeviceType::toString(DeviceType::Enum type) {
 	}
 }
 
+QString NMDeviceState::toString(NMDeviceState::Enum state) {
+	switch (state) {
+	case Unknown: return QStringLiteral("Unknown");
+	case Unmanaged: return QStringLiteral("Not managed by NetworkManager");
+	case Unavailable: return QStringLiteral("Unavailable");
+	case Disconnected: return QStringLiteral("Disconnected");
+	case Prepare: return QStringLiteral("Preparing to connect");
+	case Config: return QStringLiteral("Connecting to a network");
+	case NeedAuth: return QStringLiteral("Waiting for authentication");
+	case IPConfig: return QStringLiteral("Requesting IPv4 and/or IPv6 addresses from the network");
+	case IPCheck:
+		return QStringLiteral("Checking whether further action is required for the requested connection"
+		);
+	case Secondaries:
+		return QStringLiteral("Waiting for a required secondary connection to activate");
+	case Activated: return QStringLiteral("Connected");
+	case Deactivating: return QStringLiteral("Disconnecting");
+	case Failed: return QStringLiteral("Failed to connect");
+	};
+}
+
 NetworkDevice::NetworkDevice(DeviceType::Enum type, QObject* parent)
     : QObject(parent)
     , mType(type) {};

src/network/device.hpp

@@ -6,8 +6,6 @@
 #include <qtmetamacros.h>
 #include <qtypes.h>
 
-#include "nm/enums.hpp"
-
 namespace qs::network {
 
 ///! Connection state of a NetworkDevice.
@@ -43,6 +41,33 @@ class DeviceType: public QObject {
 	Q_INVOKABLE static QString toString(DeviceType::Enum type);
 };
 
+///! NetworkManager-specific device state.
+/// In sync with https://networkmanager.dev/docs/api/latest/nm-dbus-types.html#NMDeviceState.
+class NMDeviceState: public QObject {
+	Q_OBJECT;
+	QML_ELEMENT;
+	QML_SINGLETON;
+
+public:
+	enum Enum : quint8 {
+		Unknown = 0,
+		Unmanaged = 10,
+		Unavailable = 20,
+		Disconnected = 30,
+		Prepare = 40,
+		Config = 50,
+		NeedAuth = 60,
+		IPConfig = 70,
+		IPCheck = 80,
+		Secondaries = 90,
+		Activated = 100,
+		Deactivating = 110,
+		Failed = 120,
+	};
+	Q_ENUM(Enum);
+	Q_INVOKABLE static QString toString(NMDeviceState::Enum state);
+};
+
 ///! A network device.
 class NetworkDevice: public QObject {
 	Q_OBJECT;

src/network/nm/backend.cpp

@@ -114,7 +114,7 @@ void NetworkManager::registerDevice(const QString& path) {
 			while (!xml.atEnd() && !xml.hasError()) {
 				xml.readNext();
 
-				if (xml.isStartElement() && xml.name() == "interface") {
+				if (xml.isStartElement() && xml.name() == u"interface") {
 					const QString name = xml.attributes().value("name").toString();
 					if (name.startsWith("org.freedesktop.NetworkManager.Device.Wireless")) {
 						this->registerWifiDevice(path);
@@ -139,6 +139,7 @@ void NetworkManager::registerWifiDevice(const QString& path) {
 	}
 
 	auto* device = new WifiDevice(this);
+	auto* scanner = device->wifiScanner();
 	wireless->setParent(device);
 	this->mDeviceHash.insert(path, device);
 
@@ -154,13 +155,12 @@ void NetworkManager::registerWifiDevice(const QString& path) {
 		case 110 ... 120: return DeviceConnectionState::Disconnecting;
 		}
 	});
-	device->bindableScanning().setBinding([wireless]() { return wireless->scanning(); });
 	// clang-format off
 	QObject::connect(wireless, &NMWirelessDevice::addAndActivateConnection, this, &NetworkManager::addAndActivateConnection);
 	QObject::connect(wireless, &NMWirelessDevice::activateConnection, this, &NetworkManager::activateConnection);
-	QObject::connect(wireless, &NMWirelessDevice::wifiNetworkAdded, device, &WifiDevice::networkAdded);
-	QObject::connect(wireless, &NMWirelessDevice::wifiNetworkRemoved, device, &WifiDevice::networkRemoved);
-	QObject::connect(device, &WifiDevice::requestScan, wireless, &NMWirelessDevice::scan);
+	QObject::connect(wireless, &NMWirelessDevice::networkAdded, device, &WifiDevice::networkAdded);
+	QObject::connect(wireless, &NMWirelessDevice::networkRemoved, device, &WifiDevice::networkRemoved);
+	QObject::connect(scanner, &WifiScanner::requestEnabled, wireless, &NMWirelessDevice::handleScanner);
 	QObject::connect(device, &WifiDevice::requestDisconnect, wireless, &NMWirelessDevice::disconnect);
 	// clang-format on
 

src/network/nm/connection.cpp

@@ -14,6 +14,7 @@
 
 #include "../../core/logcat.hpp"
 #include "../../dbus/properties.hpp"
+#include "../wifi.hpp"
 #include "dbus_types.hpp"
 #include "enums.hpp"
 #include "nm/dbus_nm_active_connection.h"

src/network/nm/connection.hpp

@@ -13,6 +13,7 @@
 #include "enums.hpp"
 #include "nm/dbus_nm_active_connection.h"
 #include "nm/dbus_nm_connection_settings.h"
+#include "../wifi.hpp"
 
 namespace qs::dbus {
 

src/network/nm/enums.hpp

@@ -33,52 +33,6 @@ class NMWirelessCapabilities: public QObject {
 	Q_ENUM(Enum);
 };
 
-// In sync with https://networkmanager.dev/docs/api/latest/nm-dbus-types.html#NMDeviceState.
-class NMDeviceState: public QObject {
-	Q_OBJECT;
-	QML_ELEMENT;
-	QML_SINGLETON;
-
-public:
-	enum Enum : quint8 {
-		Unknown = 0,
-		Unmanaged = 10,
-		Unavailable = 20,
-		Disconnected = 30,
-		Prepare = 40,
-		Config = 50,
-		NeedAuth = 60,
-		IPConfig = 70,
-		IPCheck = 80,
-		Secondaries = 90,
-		Activated = 100,
-		Deactivating = 110,
-		Failed = 120,
-	};
-	Q_ENUM(Enum);
-	Q_INVOKABLE static QString toString(NMDeviceState::Enum state) {
-		switch (state) {
-		case Unknown: return QStringLiteral("Unknown");
-		case Unmanaged: return QStringLiteral("Not managed by NetworkManager");
-		case Unavailable: return QStringLiteral("Unavailable");
-		case Disconnected: return QStringLiteral("Disconnected");
-		case Prepare: return QStringLiteral("Preparing to connect");
-		case Config: return QStringLiteral("Connecting to a network");
-		case NeedAuth: return QStringLiteral("Waiting for authentication");
-		case IPConfig: return QStringLiteral("Requesting IPv4 and/or IPv6 addresses from the network");
-		case IPCheck:
-			return QStringLiteral(
-			    "Checking whether further action is required for the requested connection"
-			);
-		case Secondaries:
-			return QStringLiteral("Waiting for a required secondary connection to activate");
-		case Activated: return QStringLiteral("Connected");
-		case Deactivating: return QStringLiteral("Disconnecting");
-		case Failed: return QStringLiteral("Failed to connect");
-		};
-	};
-};
-
 // Indicates the 802.11 mode an access point is currently in.
 // In sync with https://networkmanager.dev/docs/api/latest/nm-dbus-types.html#NM80211Mode.
 class NM80211Mode: public QObject {
@@ -142,8 +96,6 @@ class NM80211ApSecurityFlags: public QObject {
 // In sync with https://networkmanager.dev/docs/api/latest/nm-dbus-types.html#NMActiveConnectionState.
 class NMConnectionState: public QObject {
 	Q_OBJECT;
-	QML_ELEMENT;
-	QML_SINGLETON;
 
 public:
 	enum Enum : quint8 {
@@ -154,63 +106,6 @@ class NMConnectionState: public QObject {
 		Deactivated = 4
 	};
 	Q_ENUM(Enum);
-	Q_INVOKABLE static QString toString(NMConnectionState::Enum state) {
-		switch (state) {
-		case Unknown: return "Unknown";
-		case Activating: return "Activating";
-		case Activated: return "Activated";
-		case Deactivating: return "Deactivating";
-		case Deactivated: return "Deactivated";
-		}
-	}
-};
-
-// Active connection state reasons.
-// In sync with https://networkmanager.dev/docs/api/latest/nm-dbus-types.html#NMActiveConnectionStateReason.
-class NMConnectionStateReason: public QObject {
-	Q_OBJECT;
-	QML_ELEMENT;
-	QML_SINGLETON;
-
-public:
-	enum Enum : quint8 {
-		Unknown = 0,
-		None = 1,
-		UserDisconnected = 2,
-		DeviceDisconnected = 3,
-		ServiceStopped = 4,
-		IpConfigInvalid = 5,
-		ConnectTimeout = 6,
-		ServiceStartTimeout = 7,
-		ServiceStartFailed = 8,
-		NoSecrets = 9,
-		LoginFailed = 10,
-		ConnectionRemoved = 11,
-		DependencyFailed = 12,
-		DeviceRealizeFailed = 13,
-		DeviceRemoved = 14
-	};
-	Q_ENUM(Enum);
-	Q_INVOKABLE static QString toString(NMConnectionStateReason::Enum reason) {
-		switch (reason) {
-		case Unknown: return "Unknown";
-		case None: return "No reason";
-		case UserDisconnected: return "User disconnection";
-		case DeviceDisconnected: return "The device the connection was using was disconnected.";
-		case ServiceStopped: return "The service providing the VPN connection was stopped.";
-		case IpConfigInvalid: return "The IP config of the active connection was invalid.";
-		case ConnectTimeout: return "The connection attempt to the VPN service timed out.";
-		case ServiceStartTimeout:
-			return "A timeout occurred while starting the service providing the VPN connection.";
-		case ServiceStartFailed: return "Starting the service providing the VPN connection failed.";
-		case NoSecrets: return "Necessary secrets for the connection were not provided.";
-		case LoginFailed: return "Authentication to the server failed.";
-		case ConnectionRemoved: return "Necessary secrets for the connection were not provided.";
-		case DependencyFailed: return " Master connection of this connection failed to activate.";
-		case DeviceRealizeFailed: return "Could not create the software device link.";
-		case DeviceRemoved: return "The device this connection depended on disappeared.";
-		};
-	};
 };
 
 } // namespace qs::network

src/network/nm/utils.cpp

@@ -1,9 +1,15 @@
 #include "utils.hpp"
 
+// We depend on non-std Linux extensions that ctime doesn't put in the global namespace
+// NOLINTNEXTLINE(modernize-deprecated-headers)
+#include <time.h>
+
 #include <qcontainerfwd.h>
+#include <qdatetime.h>
 #include <qdbusservicewatcher.h>
 #include <qobject.h>
 #include <qqmlintegration.h>
+#include <qtypes.h>
 
 #include "../wifi.hpp"
 #include "dbus_types.hpp"
@@ -218,4 +224,25 @@ WifiSecurityType::Enum findBestWirelessSecurity(
 	return WifiSecurityType::Unknown;
 }
 
+// NOLINTBEGIN
+QDateTime clockBootTimeToDateTime(qint64 clockBootTime) {
+	clockid_t clkId = CLOCK_BOOTTIME;
+	struct timespec tp {};
+
+	const QDateTime now = QDateTime::currentDateTime();
+	int r = clock_gettime(clkId, &tp);
+	if (r == -1 && errno == EINVAL) {
+		clkId = CLOCK_MONOTONIC;
+		r = clock_gettime(clkId, &tp);
+	}
+
+	// Convert to milliseconds
+	const qint64 nowInMs = tp.tv_sec * 1000 + tp.tv_nsec / 1000000;
+
+	// Return a QDateTime of the millisecond diff
+	const qint64 offset = clockBootTime - nowInMs;
+	return QDateTime::fromMSecsSinceEpoch(now.toMSecsSinceEpoch() + offset);
+}
+// NOLINTEND
+
 } // namespace qs::network

src/network/nm/utils.hpp

@@ -1,4 +1,3 @@
-
 #pragma once
 
 #include <qcontainerfwd.h>
@@ -41,4 +40,6 @@ WifiSecurityType::Enum findBestWirelessSecurity(
     NM80211ApSecurityFlags::Enum apRsn
 );
 
+QDateTime clockBootTimeToDateTime(qint64 clockBootTime);
+
 } // namespace qs::network