diff --git a/Cargo.lock b/Cargo.lock index 9fc6c772..ef0a8ba1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -107,17 +107,6 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" -[[package]] -name = "aes" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures 0.2.17", -] - [[package]] name = "ahash" version = "0.8.12" @@ -551,15 +540,6 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - [[package]] name = "block-buffer" version = "0.12.1" @@ -569,15 +549,6 @@ dependencies = [ "hybrid-array", ] -[[package]] -name = "block-padding" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" -dependencies = [ - "generic-array", -] - [[package]] name = "block2" version = "0.5.1" @@ -756,15 +727,6 @@ dependencies = [ "wayland-client", ] -[[package]] -name = "cbc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" -dependencies = [ - "cipher", -] - [[package]] name = "cc" version = "1.2.66" @@ -801,16 +763,6 @@ dependencies = [ "windows-link 0.2.1", ] -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common 0.1.7", - "inout", -] - [[package]] name = "clipboard-win" version = "5.4.1" @@ -1156,10 +1108,7 @@ dependencies = [ name = "cosmic-applet-network" version = "1.0.15" dependencies = [ - "anyhow", "async-fn-stream", - "cosmic-dbus-networkmanager", - "cosmic-settings-network-manager-subscription", "futures", "futures-util", "i18n-embed", @@ -1175,7 +1124,6 @@ dependencies = [ "tracing-log", "tracing-subscriber", "uuid", - "zbus", ] [[package]] @@ -1381,19 +1329,6 @@ dependencies = [ "zbus", ] -[[package]] -name = "cosmic-dbus-networkmanager" -version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#eed01dd3609e90e3c8cd043656734c500956c793" -dependencies = [ - "bitflags 2.13.0", - "derive_builder", - "jiff", - "procfs", - "zbus", - "zvariant", -] - [[package]] name = "cosmic-freedesktop-icons" version = "0.4.0" @@ -1411,7 +1346,7 @@ dependencies = [ [[package]] name = "cosmic-notifications-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-notifications#2e40965d058dee4e9a7c4d5274e09411521e6471" +source = "git+https://github.com/pop-os/cosmic-notifications#7c723b7705ec77b1ad5396a1baa9ae1c0cb5a0da" dependencies = [ "cosmic-config", "serde", @@ -1420,7 +1355,7 @@ dependencies = [ [[package]] name = "cosmic-notifications-util" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-notifications#2e40965d058dee4e9a7c4d5274e09411521e6471" +source = "git+https://github.com/pop-os/cosmic-notifications#7c723b7705ec77b1ad5396a1baa9ae1c0cb5a0da" dependencies = [ "fast_image_resize", "libcosmic", @@ -1560,25 +1495,6 @@ dependencies = [ "zbus", ] -[[package]] -name = "cosmic-settings-network-manager-subscription" -version = "1.0.7" -source = "git+https://github.com/pop-os/cosmic-settings#ae5c7506627373f62e78372ce9e932fb591de35b" -dependencies = [ - "bitflags 2.13.0", - "cosmic-dbus-networkmanager", - "futures", - "iced_futures", - "itertools", - "nm-secret-agent-manager", - "secret-service", - "secure-string", - "thiserror 2.0.18", - "tokio", - "tracing", - "zbus", -] - [[package]] name = "cosmic-settings-upower-subscription" version = "1.0.7" @@ -1635,15 +1551,6 @@ dependencies = [ "thiserror 2.0.18", ] -[[package]] -name = "cpufeatures" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" -dependencies = [ - "libc", -] - [[package]] name = "cpufeatures" version = "0.3.0" @@ -1686,16 +1593,6 @@ dependencies = [ "wgpu", ] -[[package]] -name = "crypto-common" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" -dependencies = [ - "generic-array", - "typenum", -] - [[package]] name = "crypto-common" version = "0.2.2" @@ -1943,37 +1840,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "derive_builder" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" -dependencies = [ - "darling 0.20.11", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "derive_builder_macro" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" -dependencies = [ - "derive_builder_core", - "syn", -] - [[package]] name = "derive_setters" version = "0.1.9" @@ -1997,26 +1863,15 @@ dependencies = [ "syn", ] -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer 0.10.4", - "crypto-common 0.1.7", - "subtle", -] - [[package]] name = "digest" version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2" dependencies = [ - "block-buffer 0.12.1", + "block-buffer", "const-oid", - "crypto-common 0.2.2", + "crypto-common", ] [[package]] @@ -2037,7 +1892,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -2235,7 +2090,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -2646,16 +2501,6 @@ dependencies = [ "slab", ] -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - [[package]] name = "gethostname" version = "1.1.0" @@ -2922,24 +2767,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" -[[package]] -name = "hkdf" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" -dependencies = [ - "hmac", -] - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest 0.10.7", -] - [[package]] name = "hybrid-array" version = "0.4.13" @@ -3784,16 +3611,6 @@ dependencies = [ "libc", ] -[[package]] -name = "inout" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" -dependencies = [ - "block-padding", - "generic-array", -] - [[package]] name = "input" version = "0.9.1" @@ -3849,15 +3666,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "itertools" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "1.0.18" @@ -4033,7 +3841,7 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a1886916523694cd6ea3d175f03a1e5010699a2a4cc13696d83d7bea1d80638" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -4554,14 +4362,6 @@ dependencies = [ "libc", ] -[[package]] -name = "nm-secret-agent-manager" -version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#eed01dd3609e90e3c8cd043656734c500956c793" -dependencies = [ - "zbus", -] - [[package]] name = "nmrs" version = "3.4.0" @@ -4624,21 +4424,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.61.2", -] - -[[package]] -name = "num" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" -dependencies = [ - "num-bigint", - "num-complex", - "num-integer", - "num-iter", - "num-rational", - "num-traits", + "windows-sys 0.59.0", ] [[package]] @@ -4651,15 +4437,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-complex" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" -dependencies = [ - "num-traits", -] - [[package]] name = "num-conv" version = "0.2.2" @@ -4686,16 +4463,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-iter" -version = "0.1.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92800bd69a1eac91786bcfe9da64a897eb72911b8dc3095decbd07429e8048b" -dependencies = [ - "num-integer", - "num-traits", -] - [[package]] name = "num-rational" version = "0.4.2" @@ -5381,27 +5148,6 @@ dependencies = [ "yansi", ] -[[package]] -name = "procfs" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25485360a54d6861439d60facef26de713b1e126bf015ec8f98239467a2b82f7" -dependencies = [ - "bitflags 2.13.0", - "procfs-core", - "rustix 1.1.4", -] - -[[package]] -name = "procfs-core" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6401bf7b6af22f78b563665d15a22e9aef27775b79b149a66ca022468a4e405" -dependencies = [ - "bitflags 2.13.0", - "hex", -] - [[package]] name = "profiling" version = "1.0.18" @@ -5756,7 +5502,7 @@ version = "8.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ffa149f6aa81b58a5b3011d01a857c4ed12c7a732d2c51947a4c7c692185f0" dependencies = [ - "sha2 0.11.0", + "sha2", "walkdir", ] @@ -5804,7 +5550,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -5895,25 +5641,6 @@ dependencies = [ "tiny-skia", ] -[[package]] -name = "secret-service" -version = "5.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a62d7f86047af0077255a29494136b9aaaf697c76ff70b8e49cded4e2623c14" -dependencies = [ - "aes", - "cbc", - "futures-util", - "generic-array", - "getrandom 0.2.17", - "hkdf", - "num", - "once_cell", - "serde", - "sha2 0.10.9", - "zbus", -] - [[package]] name = "secure-string" version = "0.3.0" @@ -6041,17 +5768,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" -[[package]] -name = "sha2" -version = "0.10.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" -dependencies = [ - "cfg-if", - "cpufeatures 0.2.17", - "digest 0.10.7", -] - [[package]] name = "sha2" version = "0.11.0" @@ -6059,8 +5775,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4" dependencies = [ "cfg-if", - "cpufeatures 0.3.0", - "digest 0.11.3", + "cpufeatures", + "digest", ] [[package]] @@ -6230,7 +5946,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -6321,12 +6037,6 @@ dependencies = [ "syn", ] -[[package]] -name = "subtle" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" - [[package]] name = "svg_fmt" version = "0.4.5" @@ -6418,10 +6128,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.4.3", + "getrandom 0.3.4", "once_cell", "rustix 1.1.4", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -6796,7 +6506,7 @@ checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e" dependencies = [ "memoffset", "tempfile", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -7428,7 +7138,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.48.0", ] [[package]] diff --git a/cosmic-applet-network/Cargo.toml b/cosmic-applet-network/Cargo.toml index 3ba86f2b..edbf03b6 100644 --- a/cosmic-applet-network/Cargo.toml +++ b/cosmic-applet-network/Cargo.toml @@ -5,9 +5,7 @@ edition = "2024" license = "GPL-3.0-or-later" [dependencies] -anyhow.workspace = true async-fn-stream = "0.3" -cosmic-dbus-networkmanager = { git = "https://github.com/pop-os/dbus-settings-bindings" } futures.workspace = true futures-util.workspace = true i18n-embed-fl.workspace = true @@ -25,14 +23,7 @@ tokio.workspace = true tracing-log.workspace = true tracing-subscriber.workspace = true tracing.workspace = true -zbus.workspace = true indexmap = "2.13.0" secure-string = "0.3.0" uuid = { version = "1.21.0", features = ["v4"] } -nmrs = "3.1.3" - - - -[dependencies.cosmic-settings-network-manager-subscription] -git = "https://github.com/pop-os/cosmic-settings/" -# path = "../../cosmic-settings/subscriptions/network-manager" +nmrs = "3.4.0" diff --git a/cosmic-applet-network/src/app.rs b/cosmic-applet-network/src/app.rs index d66632ab..3cfee15a 100644 --- a/cosmic-applet-network/src/app.rs +++ b/cosmic-applet-network/src/app.rs @@ -1,13 +1,7 @@ -use anyhow::Context; -use cosmic_settings_network_manager_subscription::{ - self as network_manager, NetworkManagerState, UUID, - available_wifi::{AccessPoint, NetworkType}, - current_networks::ActiveConnectionInfo, - hw_address::HwAddress, -}; use indexmap::IndexMap; use nmrs::{ - NetworkManager as NmrsManager, SettingsSummary, + ActiveConnection, ActiveConnectionState, ConnectType, ConnectivityState, EapOptions, + NetworkEvent, NetworkManager as NmrsManager, NetworkSnapshot, WifiSecurity, agent::{SecretAgent, SecretAgentCapabilities, SecretRequest, SecretResponder, SecretSetting}, }; use rustc_hash::FxHashSet; @@ -15,11 +9,13 @@ use secure_string::SecureString; use std::{ borrow::Cow, collections::{BTreeMap, HashMap}, + fmt, + str::FromStr, sync::{Arc, LazyLock}, }; use cosmic::{ - Apply, Element, Task, app, + Element, Task, app, applet::{ menu_button, menu_control_padding, padded_control, token::subscription::{TokenRequest, TokenUpdate, activation_token_subscription}, @@ -29,7 +25,7 @@ use cosmic::{ iced::core::window, iced::{ Alignment, Length, Subscription, - platform_specific::shell::wayland::commands::popup::{destroy_popup, get_popup}, + platform_specific::shell::wayland::commands::popup::destroy_popup, }, surface, theme, widget::{ @@ -38,12 +34,8 @@ use cosmic::{ indeterminate_circular, row, scrollable, secure_input, text, text_input, toggler, }, }; -use cosmic_dbus_networkmanager::interface::enums::{ - ActiveConnectionState, DeviceState, NmConnectivityState, -}; use futures::{StreamExt, lock::Mutex as AsyncMutex}; -use zbus::Connection; use crate::{config, fl}; @@ -64,17 +56,6 @@ enum NewConnectionState { Failure(AccessPoint), } -impl NewConnectionState { - pub fn ssid(&self) -> &str { - &match self { - Self::EnterPassword { access_point, .. } => access_point, - Self::Waiting(ap) => ap, - Self::Failure(ap) => ap, - } - .ssid - } -} - impl From for AccessPoint { fn from(connection_state: NewConnectionState) -> Self { match connection_state { @@ -87,11 +68,183 @@ impl From for AccessPoint { pub static SECURE_INPUT_WIFI: LazyLock = LazyLock::new(Id::unique); +type Uuid = Arc; +type Ssid = Arc; + +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub enum NetworkType { + Open, + Password, + Eap, +} + +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub enum DeviceState { + Unknown, + Unmanaged, + Unavailable, + Disconnected, + NeedAuth, + Activated, + Failed, + Other, +} + +impl From<&nmrs::DeviceState> for DeviceState { + fn from(state: &nmrs::DeviceState) -> Self { + match state { + nmrs::DeviceState::Unmanaged => Self::Unmanaged, + nmrs::DeviceState::Unavailable => Self::Unavailable, + nmrs::DeviceState::Disconnected => Self::Disconnected, + nmrs::DeviceState::NeedAuth => Self::NeedAuth, + nmrs::DeviceState::Activated => Self::Activated, + nmrs::DeviceState::Failed => Self::Failed, + nmrs::DeviceState::Other(_) => Self::Unknown, + _ => Self::Other, + } + } +} + +#[derive(Default, Debug, Clone, Copy, PartialEq, Eq, Hash)] +pub struct HwAddress([u8; 6]); + +impl HwAddress { + fn as_string(self) -> String { + self.0 + .iter() + .map(|byte| format!("{byte:02X}")) + .collect::>() + .join(":") + } +} + +impl FromStr for HwAddress { + type Err = (); + + fn from_str(value: &str) -> Result { + let mut bytes = [0; 6]; + let mut parts = value.split(':'); + for byte in &mut bytes { + let Some(part) = parts.next() else { + return Err(()); + }; + *byte = u8::from_str_radix(part, 16).map_err(|_| ())?; + } + if parts.next().is_some() { + return Err(()); + } + Ok(Self(bytes)) + } +} + +impl fmt::Display for HwAddress { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + f.write_str(&self.as_string()) + } +} + +fn same_access_point(left: &AccessPoint, right: &AccessPoint) -> bool { + left.ssid == right.ssid + && left.hw_address == right.hw_address + && left.interface == right.interface +} + +#[derive(Debug, Clone, PartialEq, Eq)] +pub struct AccessPoint { + pub ssid: Ssid, + pub network_type: NetworkType, + pub hw_address: HwAddress, + pub strength: u8, + pub state: DeviceState, + pub working: bool, + pub wps_push: bool, + pub interface: Option, +} + +#[derive(Debug, Clone)] +pub enum ActiveConnectionInfo { + Wired { + name: String, + hw_address: String, + speed: u32, + ip_addresses: Vec, + }, + WiFi { + name: String, + ip_addresses: Vec, + state: ActiveConnectionState, + strength: u8, + hw_address: String, + }, + Vpn { + name: String, + ip_addresses: Vec, + }, +} + +impl ActiveConnectionInfo { + fn name(&self) -> &str { + match self { + Self::Wired { name, .. } | Self::WiFi { name, .. } | Self::Vpn { name, .. } => name, + } + } +} + +#[derive(Debug, Clone)] +pub struct NetworkManagerState { + pub wifi_enabled: bool, + pub airplane_mode: bool, + pub connectivity: ConnectivityState, + pub active_conns: Vec, + pub known_access_points: Vec, + pub wireless_access_points: Vec, +} + +impl Default for NetworkManagerState { + fn default() -> Self { + Self { + wifi_enabled: true, + airplane_mode: false, + connectivity: ConnectivityState::Unknown, + active_conns: Vec::new(), + known_access_points: Vec::new(), + wireless_access_points: Vec::new(), + } + } +} + +#[derive(Clone, Debug, PartialEq, Eq)] +pub enum DeviceType { + Wifi, +} + +#[derive(Clone, Debug)] +pub struct DeviceConnection { + pub id: String, +} + +#[derive(Clone, Debug)] +pub struct DeviceInfo { + pub interface: String, + pub device_type: DeviceType, + pub active_connection: Option<(DeviceConnection,)>, + pub known_connections: Vec, +} + +#[derive(Debug, Clone)] +pub struct AppletSnapshot { + pub state: NetworkManagerState, + pub devices: Vec, + pub known_vpns: IndexMap, + pub ssid_to_uuid: BTreeMap, Box>, + pub captive_portal_url: Option, +} + #[derive(Default, Debug, Clone)] pub struct MyNetworkState { - pub known_vpns: IndexMap, + pub known_vpns: IndexMap, pub ssid_to_uuid: BTreeMap, Box>, - pub devices: Vec>, + pub devices: Vec>, pub nm_state: NetworkManagerState, pub requested_vpn: Option, } @@ -148,21 +301,18 @@ struct CosmicNetworkApplet { popup: Option, // NM state - nm_sender: Option>, - nm_task: Option>, nm_state: MyNetworkState, // UI state show_visible_networks: bool, show_available_vpns: bool, new_connection: Option, - conn: Option, toggle_wifi_ctr: u128, token_tx: Option>, failed_known_ssids: FxHashSet>, /// When defined, displays connections for the specific device. - active_device: Option>, + active_device: Option>, } fn wifi_icon(strength: u8) -> &'static str { @@ -297,7 +447,279 @@ fn vpn_section<'a>( vpn_col } +fn ip_addresses(ip4_address: Option, ip6_address: Option) -> Vec { + ip4_address.into_iter().chain(ip6_address).collect() +} + +fn network_type(security: nmrs::SecurityFeatures) -> NetworkType { + match security.preferred_connect_type() { + ConnectType::Open | ConnectType::Owe => NetworkType::Open, + ConnectType::Eap => NetworkType::Eap, + ConnectType::Psk | ConnectType::Sae => NetworkType::Password, + _ => NetworkType::Password, + } +} + +fn wifi_security( + access_point: &AccessPoint, + identity: Option, + password: Option, +) -> WifiSecurity { + match access_point.network_type { + NetworkType::Open => WifiSecurity::Open, + NetworkType::Eap => WifiSecurity::WpaEap { + opts: EapOptions::new( + identity.unwrap_or_default(), + password + .as_ref() + .map(|password| password.unsecure().to_owned()) + .unwrap_or_default(), + ), + }, + NetworkType::Password => WifiSecurity::WpaPsk { + psk: password + .as_ref() + .map(|password| password.unsecure().to_owned()) + .unwrap_or_default(), + }, + } +} + +fn connect_access_point_task( + access_point: AccessPoint, + identity: Option, + password: Option, +) -> Task> { + cosmic::task::future(async move { + let ssid = access_point.ssid.to_string(); + let interface = access_point.interface.clone(); + let bssid = access_point.hw_address.as_string(); + let security = wifi_security(&access_point, identity, password); + match NmrsManager::new().await { + Ok(nm) => { + match nm + .connect_to_bssid(&ssid, Some(&bssid), interface.as_deref(), security) + .await + { + Ok(()) => Message::ConnectionAttemptFinished { + access_point, + success: true, + error: None, + }, + Err(e) => Message::ConnectionAttemptFinished { + access_point, + success: false, + error: Some(e.to_string()), + }, + } + } + Err(e) => Message::Error(format!("nmrs init: {e}")), + } + }) + .map(cosmic::Action::App) +} + +fn snapshot_task() -> Task { + cosmic::task::future(async move { + let nm = match NmrsManager::new().await { + Ok(nm) => nm, + Err(e) => return Message::Error(format!("nmrs init: {e}")), + }; + + match nm.snapshot().await { + Ok(snapshot) => Message::Snapshot(snapshot_to_applet(snapshot)), + Err(e) => Message::Error(format!("snapshot: {e}")), + } + }) +} + +fn network_events_task() -> Task { + cosmic::Task::stream(async_fn_stream::fn_stream(|emitter| async move { + let nm = match NmrsManager::new().await { + Ok(nm) => nm, + Err(e) => { + let _ = emitter + .emit(Message::Error(format!("nmrs init: {e}"))) + .await; + return; + } + }; + let mut events = match nm.network_events().await { + Ok(events) => events, + Err(e) => { + let _ = emitter + .emit(Message::Error(format!("network events: {e}"))) + .await; + return; + } + }; + + while let Some(event) = events.next().await { + match event { + Ok(event) => { + let _ = emitter.emit(Message::NetworkEvent(event)).await; + } + Err(e) => { + let _ = emitter + .emit(Message::Error(format!("network event: {e}"))) + .await; + } + } + } + })) +} + +fn snapshot_to_applet(snapshot: NetworkSnapshot) -> AppletSnapshot { + let summary = snapshot.applet_summary(); + let mut known_vpns = IndexMap::new(); + for vpn in summary.saved_vpns.values() { + let uuid: Uuid = Arc::from(vpn.uuid.as_str()); + let entry = match vpn.kind { + Some(nmrs::VpnKind::WireGuard) => ConnectionSettings::Wireguard { id: vpn.id.clone() }, + _ => ConnectionSettings::Vpn { id: vpn.id.clone() }, + }; + known_vpns.insert(uuid, entry); + } + + let mut ssid_to_uuid = BTreeMap::new(); + for (ssid, profiles) in &summary.known_wifi { + if let Some(profile) = profiles.first() { + ssid_to_uuid.insert( + ssid.clone().into_boxed_str(), + profile.uuid.clone().into_boxed_str(), + ); + } + } + + let active_conns = snapshot + .active_connections + .iter() + .filter_map(|conn| match conn { + ActiveConnection::Wired(wired) => Some(ActiveConnectionInfo::Wired { + name: wired.id.clone(), + hw_address: wired.hw_address.clone().unwrap_or_default(), + speed: wired.speed_mbps.unwrap_or_default(), + ip_addresses: ip_addresses(wired.ip4_address.clone(), wired.ip6_address.clone()), + }), + ActiveConnection::Wifi(wifi) => Some(ActiveConnectionInfo::WiFi { + name: wifi.ssid.clone(), + ip_addresses: ip_addresses(wifi.ip4_address.clone(), wifi.ip6_address.clone()), + state: wifi.state, + strength: wifi.strength.unwrap_or_default(), + hw_address: wifi.bssid.clone().unwrap_or_default(), + }), + ActiveConnection::Vpn(vpn) => Some(ActiveConnectionInfo::Vpn { + name: vpn.id.clone(), + ip_addresses: ip_addresses(vpn.ip4_address.clone(), vpn.ip6_address.clone()), + }), + ActiveConnection::Other(_) | _ => None, + }) + .collect(); + + let wireless_access_points = summary + .wifi_groups + .iter() + .map(|group| { + let strongest = &group.strongest; + AccessPoint { + ssid: Arc::from(group.ssid.as_str()), + network_type: network_type(strongest.security), + hw_address: HwAddress::from_str(&strongest.bssid).unwrap_or_default(), + strength: strongest.strength, + state: DeviceState::from(&strongest.device_state), + working: false, + wps_push: strongest.security.wps, + interface: Some(group.interface.clone()), + } + }) + .collect::>(); + + let known_access_points = summary + .wifi_groups + .iter() + .filter(|group| group.known || group.active) + .map(|group| { + let strongest = &group.strongest; + AccessPoint { + ssid: Arc::from(group.ssid.as_str()), + network_type: network_type(strongest.security), + hw_address: HwAddress::from_str(&strongest.bssid).unwrap_or_default(), + strength: strongest.strength, + state: if group.active { + DeviceState::Activated + } else { + DeviceState::from(&strongest.device_state) + }, + working: false, + wps_push: strongest.security.wps, + interface: Some(group.interface.clone()), + } + }) + .collect::>(); + + let devices = snapshot + .wifi_devices + .iter() + .map(|device| { + let known_connections = summary + .known_wifi + .iter() + .filter(|(ssid, _)| { + summary + .wifi_groups + .iter() + .any(|group| group.interface == device.interface && group.ssid == **ssid) + }) + .map(|(ssid, _)| DeviceConnection { id: ssid.clone() }) + .collect(); + DeviceInfo { + interface: device.interface.clone(), + device_type: DeviceType::Wifi, + active_connection: device + .active_ssid + .as_ref() + .map(|ssid| (DeviceConnection { id: ssid.clone() },)), + known_connections, + } + }) + .collect(); + + AppletSnapshot { + state: NetworkManagerState { + wifi_enabled: snapshot.wifi.enabled, + airplane_mode: summary.airplane_mode.is_airplane_mode(), + connectivity: summary.connectivity.state, + active_conns, + known_access_points, + wireless_access_points, + }, + devices, + known_vpns, + ssid_to_uuid, + captive_portal_url: summary.connectivity.captive_portal_url.clone(), + } +} + impl CosmicNetworkApplet { + fn apply_snapshot(&mut self, snapshot: AppletSnapshot) { + let previous_connectivity = self.nm_state.nm_state.connectivity; + self.update_nm_state(snapshot.state); + self.nm_state.devices = snapshot.devices.into_iter().map(Arc::new).collect(); + self.nm_state.known_vpns = snapshot.known_vpns; + self.nm_state.ssid_to_uuid = snapshot.ssid_to_uuid; + + if !previous_connectivity.is_captive() && self.nm_state.nm_state.connectivity.is_captive() { + let mut browser = std::process::Command::new("xdg-open"); + browser.arg( + snapshot + .captive_portal_url + .as_deref() + .unwrap_or("http://204.pop-os.org/"), + ); + tokio::spawn(cosmic::process::spawn(browser)); + } + } + fn update_nm_state(&mut self, mut new_state: NetworkManagerState) { self.update_togglers(&new_state); // check for failed conns that can be reset @@ -307,7 +729,7 @@ impl CosmicNetworkApplet { }; if matches!(state, ActiveConnectionState::Activated) { - self.failed_known_ssids.remove(new_s.name().as_str()); + self.failed_known_ssids.remove(new_s.name()); continue; } if matches!( @@ -396,6 +818,7 @@ impl CosmicNetworkApplet { Err(e) => Message::Error(format!("nmrs init: {e}")), } }) + .map(cosmic::Action::App) } } @@ -494,28 +917,26 @@ pub(crate) enum Message { /// An update from the secret agent SecretAgent(NmAgentEvent), /// Connect to a WiFi network access point. - Connect(network_manager::SSID, HwAddress), + Connect(Ssid, HwAddress), /// Connect with a password ConnectWithPassword, - KnownConnections(IndexMap), - /// Settings for known connections. - ConnectionSettings(BTreeMap, Box>), /// Disconnect from an access point. - Disconnect(network_manager::SSID, HwAddress), + Disconnect(Ssid, HwAddress), + ConnectionAttemptFinished { + access_point: AccessPoint, + success: bool, + error: Option, + }, /// An error occurred. Error(String), /// Identity update from the dialog IdentityUpdate(String), - /// An update from the network manager daemon - NetworkManager(network_manager::Event), - /// Successfully connected to the system dbus. - NetworkManagerConnect(zbus::Connection), + /// An update from NetworkManager. + NetworkEvent(NetworkEvent), /// Update the password from the dialog PasswordUpdate(SecureString), - /// Update NetworkManagerState - UpdateState(NetworkManagerState), - /// Update the devices lists - UpdateDevices(Vec), + /// Update applet state from NetworkManager. + Snapshot(AppletSnapshot), /// Toggle WiFi access WiFiEnable(bool), /// Refresh state @@ -525,176 +946,7 @@ pub(crate) enum Message { VPNPasswordUpdate(SecureString), CancelVPNConnection, /// Selects a device to display connections from - SelectDevice(Option>), -} - -fn connection_settings(conn: zbus::Connection) -> Task { - let settings = async move { - let settings = network_manager::dbus::settings::NetworkManagerSettings::new(&conn).await?; - - _ = settings.load_connections(&[]).await; - - let settings = settings - // Get a list of known connections. - .list_connections() - .await? - // Prepare for wrapping in a concurrent stream. - .into_iter() - .map(|conn| async move { conn }) - // Create a concurrent stream for each connection. - .apply(futures::stream::FuturesOrdered::from_iter) - // Concurrently fetch settings for each connection. - .filter_map(|conn| async move { - conn.get_settings() - .await - .map(network_manager::Settings::new) - .ok() - }) - // Reduce the settings list into a SSID->UUID map. - .fold(BTreeMap::new(), |mut set, settings| async move { - if let Some(ref wifi) = settings.wifi - && let Some(ssid) = wifi - .ssid - .clone() - .and_then(|ssid| String::from_utf8(ssid).ok()) - && let Some(ref connection) = settings.connection - && let Some(uuid) = connection.uuid.clone() - { - set.insert(ssid.into(), uuid.into()); - return set; - } - - set - }) - .await; - - Ok::<_, zbus::Error>(settings) - }; - - cosmic::task::future(async move { - settings - .await - .context("failed to get connection settings") - .map_or_else( - |why| Message::Error(why.to_string()), - Message::ConnectionSettings, - ) - }) -} - -pub fn update_state(conn: zbus::Connection) -> Task { - cosmic::task::future(async move { - match NetworkManagerState::new(&conn).await { - Ok(state) => Message::UpdateState(state), - Err(why) => Message::Error(why.to_string()), - } - }) -} - -pub fn update_devices(conn: zbus::Connection) -> Task { - cosmic::task::future(async move { - let filter = - |device_type| matches!(device_type, network_manager::devices::DeviceType::Wifi); - match network_manager::devices::list(&conn, filter).await { - Ok(devices) => Message::UpdateDevices(devices), - Err(why) => Message::Error(why.to_string()), - } - }) -} - -impl CosmicNetworkApplet { - fn connect(&mut self, conn: zbus::Connection) -> Task { - if self.nm_task.is_none() { - let popup = self.popup; - let (canceller, task) = crate::utils::forward_event_loop(move |emitter| async move { - let (tx, mut rx) = futures::channel::mpsc::channel(1); - - if popup.is_some() { - let watchers = std::pin::pin!(async move { - futures::join!( - network_manager::watch(conn.clone(), tx.clone()), - network_manager::active_conns::watch(conn.clone(), tx.clone(),), - network_manager::wireless_enabled::watch(conn.clone(), tx.clone()), - network_manager::watch_connections_changed(conn, tx,) - ); - }); - let forwarder = std::pin::pin!(async move { - while let Some(message) = rx.next().await { - _ = emitter.emit(Message::NetworkManager(message)).await; - } - }); - - futures::future::select(watchers, forwarder).await; - } else { - let watchers = std::pin::pin!(async move { - futures::join!( - network_manager::watch(conn.clone(), tx.clone()), - network_manager::active_conns::watch(conn.clone(), tx.clone(),), - network_manager::wireless_enabled::watch(conn.clone(), tx.clone()), - ); - }); - let forwarder = std::pin::pin!(async move { - while let Some(message) = rx.next().await { - _ = emitter.emit(Message::NetworkManager(message)).await; - } - }); - - futures::future::select(watchers, forwarder).await; - }; - }); - - self.nm_task = Some(canceller); - return task.map(Message::from); - } - - Task::none() - } -} - -fn load_vpns(_conn: zbus::Connection) -> Task { - cosmic::task::future(async move { - let nm = match NmrsManager::new().await { - Ok(nm) => nm, - Err(e) => return Message::Error(format!("nmrs init: {e}")), - }; - - let saved = match nm.list_saved_connections().await { - Ok(saved) => saved, - Err(e) => return Message::Error(format!("list saved connections: {e}")), - }; - - let mut map: IndexMap = IndexMap::new(); - for c in saved { - // Skip in-memory-only NM connections — assumed connections that NM - // auto-generated from externally-managed interfaces (e.g. one - // brought up by wg-quick@wg0.service) report unsaved=true and - // evaporate on deactivate, leaving the applet's toggle dead. - if c.unsaved { - continue; - } - let uuid: UUID = Arc::from(c.uuid.as_str()); - let entry = match c.summary { - SettingsSummary::WireGuard { .. } => ConnectionSettings::Wireguard { id: c.id }, - SettingsSummary::Vpn { .. } => ConnectionSettings::Vpn { id: c.id }, - _ => continue, - }; - map.insert(uuid, entry); - } - - Message::KnownConnections(map) - }) -} - -fn system_conn() -> Task { - cosmic::Task::future(async move { - zbus::Connection::system() - .await - .context("failed to create system dbus connection") - .map_or_else( - |why| Message::Error(why.to_string()), - Message::NetworkManagerConnect, - ) - }) + SelectDevice(Option>), } impl cosmic::Application for CosmicNetworkApplet { @@ -711,7 +963,19 @@ impl cosmic::Application for CosmicNetworkApplet { ..Default::default() }; - (applet, system_conn().map(cosmic::Action::App)) + let uuid = uuid::Uuid::new_v4().to_string().replace("-", "_"); + let my_id = + format!("com.system76.CosmicSettings.Applet._{uuid}.NetworkManager.SecretAgent",); + + ( + applet, + Task::batch(vec![ + snapshot_task(), + network_events_task(), + secret_agent_task(my_id).map(Message::SecretAgent), + ]) + .map(cosmic::Action::App), + ) } fn core(&self) -> &cosmic::app::Core { @@ -730,24 +994,7 @@ impl cosmic::Application for CosmicNetworkApplet { return destroy_popup(p); } else { let mut tasks = Vec::with_capacity(2); - if let Some(conn) = self.conn.clone() { - tasks.push(update_state(conn.clone()).map(cosmic::Action::App)); - tasks.push(update_devices(conn.clone()).map(cosmic::Action::App)); - tasks.push(load_vpns(conn).map(cosmic::Action::App)); - let uuid = uuid::Uuid::new_v4().to_string().replace("-", "_"); - - let my_id = format!( - "com.system76.CosmicSettings.Applet._{uuid}.NetworkManager.SecretAgent", - ); - tasks.push( - secret_agent_task(my_id) - .map(Message::SecretAgent) - .map(cosmic::Action::App), - ); - } - - tasks.push(system_conn().map(cosmic::Action::App)); - + tasks.push(snapshot_task().map(cosmic::Action::App)); tasks.push(cosmic::surface::surface_task( cosmic::surface::action::app_popup( |_| Default::default(), @@ -789,45 +1036,20 @@ impl cosmic::Application for CosmicNetworkApplet { .map(cosmic::Action::App); } Message::SelectWirelessAccessPoint(access_point) => { - let Some(tx) = self.nm_sender.as_ref() else { - return Task::none(); - }; - if matches!(access_point.network_type, NetworkType::Open) { - if let Err(err) = - tx.unbounded_send(network_manager::Request::SelectAccessPoint( - access_point.ssid.clone(), - access_point.network_type, - None, - self.active_device.as_ref().map(|d| d.interface.clone()), - )) - { - if err.is_disconnected() { - return system_conn().map(cosmic::Action::App); - } - - tracing::error!("{err:?}"); - } - self.new_connection = Some(NewConnectionState::Waiting(access_point)); + self.new_connection = Some(NewConnectionState::Waiting(access_point.clone())); + return connect_access_point_task(access_point, None, None); } else { - if self + let known = self .nm_state .nm_state .known_access_points - .contains(&access_point) - && let Err(err) = - tx.unbounded_send(network_manager::Request::SelectAccessPoint( - access_point.ssid.clone(), - access_point.network_type, - None, - self.active_device.as_ref().map(|d| d.interface.clone()), - )) - { - if err.is_disconnected() { - return system_conn().map(cosmic::Action::App); - } - - tracing::error!("{err:?}"); + .iter() + .any(|known| same_access_point(known, &access_point)); + if known { + self.new_connection = + Some(NewConnectionState::Waiting(access_point.clone())); + return connect_access_point_task(access_point, None, None); } self.new_connection = Some(NewConnectionState::EnterPassword { access_point, @@ -862,11 +1084,6 @@ impl cosmic::Application for CosmicNetworkApplet { Message::CloseRequested(id) => { if Some(id) == self.popup { self.popup = None; - if let Some(cancel) = self.nm_task.take() { - _ = cancel.send(()); - } - - return system_conn().map(cosmic::Action::App); } } Message::OpenSettings => { @@ -946,7 +1163,7 @@ impl cosmic::Application for CosmicNetworkApplet { } }) .map(cosmic::Action::App); - let reconnect_task = self.update(Message::SelectWirelessAccessPoint(ap)); + let reconnect_task = connect_access_point_task(ap, None, None); return Task::batch(vec![forget_task, reconnect_task]); } Message::Surface(a) => { @@ -973,41 +1190,18 @@ impl cosmic::Application for CosmicNetworkApplet { self.show_available_vpns = !self.show_available_vpns; } Message::Connect(ssid, hw_address) => { - let mut network_type = NetworkType::Open; - let tx = if let Some(tx) = self.nm_sender.as_ref() { - if let Some(ap) = self - .nm_state - .nm_state - .known_access_points - .iter_mut() - .find(|c| c.ssid == ssid && c.hw_address == hw_address) - { - network_type = ap.network_type; - ap.working = true; - } - tx - } else { - return Task::none(); - }; - if let Err(err) = tx.unbounded_send(network_manager::Request::SelectAccessPoint( - ssid, - network_type, - None, - self.active_device.as_ref().map(|d| d.interface.clone()), - )) { - if err.is_disconnected() { - return system_conn().map(cosmic::Action::App); - } - - tracing::error!("{err:?}"); + if let Some(ap) = self + .nm_state + .nm_state + .known_access_points + .iter_mut() + .find(|c| c.ssid == ssid && c.hw_address == hw_address) + { + ap.working = true; + return connect_access_point_task(ap.clone(), None, None); } } Message::ConnectWithPassword => { - // save password - let Some(tx) = self.nm_sender.as_ref() else { - return Task::none(); - }; - if let Some(NewConnectionState::EnterPassword { password, access_point, @@ -1015,55 +1209,44 @@ impl cosmic::Application for CosmicNetworkApplet { .. }) = self.new_connection.take() { - let is_enterprise: bool = matches!(access_point.network_type, NetworkType::EAP); - - if let Err(err) = tx.unbounded_send(network_manager::Request::Authenticate { - ssid: access_point.ssid.to_string(), - identity: is_enterprise.then(|| identity.clone()), - password, - secret_tx: None, - interface: self.active_device.as_ref().map(|d| d.interface.clone()), - }) { - if err.is_disconnected() { - return system_conn().map(cosmic::Action::App); - } - tracing::error!("Failed to authenticate with network manager"); - } self.new_connection - .replace(NewConnectionState::Waiting(access_point)); + .replace(NewConnectionState::Waiting(access_point.clone())); + return connect_access_point_task(access_point, Some(identity), Some(password)); } } - Message::ConnectionSettings(btree_map) => { - self.nm_state.ssid_to_uuid = btree_map; - } Message::Disconnect(ssid, hw_address) => { self.new_connection = None; - let tx = if let Some(tx) = self.nm_sender.as_ref() { - if let Some(ActiveConnectionInfo::WiFi { state, .. }) = - self.nm_state.nm_state.active_conns.iter_mut().find(|c| { - let c_hw_address = match c { - ActiveConnectionInfo::Wired { hw_address, .. } - | ActiveConnectionInfo::WiFi { hw_address, .. } => { - HwAddress::from_str(hw_address).unwrap() - } - ActiveConnectionInfo::Vpn { .. } => HwAddress::default(), - }; - c.name().as_str() == ssid.as_ref() && c_hw_address == hw_address - }) - { - *state = ActiveConnectionState::Deactivating; - } - tx - } else { - return Task::none(); - }; - if let Err(err) = tx.unbounded_send(network_manager::Request::Disconnect(ssid)) { - if err.is_disconnected() { - return system_conn().map(cosmic::Action::App); - } - - tracing::error!("{err:?}"); + let interface = self + .nm_state + .nm_state + .known_access_points + .iter() + .find(|ap| ap.ssid == ssid && ap.hw_address == hw_address) + .and_then(|ap| ap.interface.clone()); + if let Some(ActiveConnectionInfo::WiFi { state, .. }) = + self.nm_state.nm_state.active_conns.iter_mut().find(|c| { + let c_hw_address = match c { + ActiveConnectionInfo::Wired { hw_address, .. } + | ActiveConnectionInfo::WiFi { hw_address, .. } => { + HwAddress::from_str(hw_address).unwrap_or_default() + } + ActiveConnectionInfo::Vpn { .. } => HwAddress::default(), + }; + c.name() == ssid.as_ref() && c_hw_address == hw_address + }) + { + *state = ActiveConnectionState::Deactivating; } + return cosmic::task::future(async move { + match NmrsManager::new().await { + Ok(nm) => match nm.disconnect(interface.as_deref()).await { + Ok(()) => Message::Refresh, + Err(e) => Message::Error(format!("disconnect {ssid}: {e}")), + }, + Err(e) => Message::Error(format!("nmrs init: {e}")), + } + }) + .map(cosmic::Action::App); } Message::Error(error) => { tracing::error!("error: {error:?}") @@ -1075,132 +1258,29 @@ impl cosmic::Application for CosmicNetworkApplet { *identity = new_identity; } } - Message::NetworkManager(event) => match event { - network_manager::Event::Init { - conn, - sender, - state, - } => { - self.nm_sender = Some(sender); - self.update_nm_state(state); - self.conn = Some(conn); - } - network_manager::Event::WiFiEnabled(_) - | network_manager::Event::WirelessAccessPoints - | network_manager::Event::ActiveConns => { - if let Some(conn) = self.conn.clone() { - return Task::future(async move { - let conn = conn.clone(); - NetworkManagerState::new(&conn).await - }) - .map(|res| match res { - Ok(s) => Message::UpdateState(s), - Err(err) => Message::Error(err.to_string()), - }) - .map(cosmic::Action::App); + Message::ConnectionAttemptFinished { + access_point, + success, + error, + } => { + if success { + self.failed_known_ssids.remove(access_point.ssid.as_ref()); + self.new_connection = None; + self.show_visible_networks = false; + } else { + if let Some(error) = error { + tracing::warn!("connect {} failed: {error}", access_point.ssid); } + self.failed_known_ssids.insert(access_point.ssid.clone()); + self.new_connection = Some(NewConnectionState::Failure(access_point)); } - network_manager::Event::RequestResponse { - mut state, - success, - req, - } => { - if let network_manager::Request::SelectAccessPoint( - ssid, - _hw_address, - _network_type, - _secret_tx, - ) = &req - { - let conn_match = self - .new_connection - .as_ref() - .is_some_and(|c| c.ssid() == ssid.as_ref() ); - - if conn_match && success { - if let Some(ActiveConnectionInfo::WiFi { state, .. }) = state - .active_conns - .iter_mut() - .find(|ap| ap.name().as_str() == ssid.as_ref()) - { - *state = ActiveConnectionState::Activated; - } - self.failed_known_ssids.remove(ssid); - self.new_connection = None; - self.show_visible_networks = false; - } else if !matches!( - &self.new_connection, - Some(NewConnectionState::EnterPassword { .. }) - ) && !success { - self.failed_known_ssids.insert(ssid.clone()); - } - } else if let network_manager::Request::Authenticate { - ssid, - identity: _, - password: _, - secret_tx: _, - interface: _, - } = &req - { - if let Some(NewConnectionState::Waiting(access_point)) = - self.new_connection.as_ref() - { - if !success - && ssid.as_str() == access_point.ssid.as_ref() - { - self.new_connection = - Some(NewConnectionState::Failure(access_point.clone())); - } else { - self.show_visible_networks = false; - } - } else if let Some(NewConnectionState::EnterPassword { access_point, .. }) = - self.new_connection.as_ref() - && success - && ssid.as_str() == access_point.ssid.as_ref() - { - self.new_connection = None; - self.show_visible_networks = false; - } - } else if self - .new_connection - .as_ref() - .map(NewConnectionState::ssid).is_some_and(|ssid| { - state.active_conns.iter().any(|c| - matches!(c, ActiveConnectionInfo::WiFi { name, state: ActiveConnectionState::Activated, .. } if ssid == name) - ) - }) { - self.new_connection = None; - self.show_visible_networks = false; - } - - if !matches!(req, network_manager::Request::Reload) - && matches!(state.connectivity, NmConnectivityState::Portal) - { - let mut browser = std::process::Command::new("xdg-open"); - browser.arg("http://204.pop-os.org/"); - - tokio::spawn(cosmic::process::spawn(browser)); - } - - self.update_nm_state(state); + return snapshot_task().map(cosmic::Action::App); + } + Message::NetworkEvent(event) => { + if matches!(event, NetworkEvent::NetworkManagerRestarted) { + tracing::debug!("NetworkManager restarted; refreshing network snapshot"); } - - cosmic_settings_network_manager_subscription::Event::Devices => { - if let Some(conn) = self.conn.clone() { - return update_devices(conn).map(cosmic::Action::App); - } - } - cosmic_settings_network_manager_subscription::Event::WiFiCredentials { - ssid: _, - password: _, - security_type: _, - } => {} - }, - Message::NetworkManagerConnect(connection) => { - return cosmic::task::batch(vec![ - self.connect(connection.clone()), - connection_settings(connection), - ]); + return snapshot_task().map(cosmic::Action::App); } Message::PasswordUpdate(entered_pw) => { if let Some(NewConnectionState::EnterPassword { password, .. }) = @@ -1209,11 +1289,8 @@ impl cosmic::Application for CosmicNetworkApplet { *password = entered_pw; } } - Message::UpdateState(network_manager_state) => { - self.update_nm_state(network_manager_state); - } - Message::UpdateDevices(device_infos) => { - self.nm_state.devices = device_infos.into_iter().map(Arc::new).collect(); + Message::Snapshot(snapshot) => { + self.apply_snapshot(snapshot); } Message::WiFiEnable(enable) => { self.nm_state.nm_state.wifi_enabled = enable; @@ -1303,18 +1380,8 @@ impl cosmic::Application for CosmicNetworkApplet { tracing::error!("Error from secret agent: {error}"); } }, - Message::KnownConnections(index_map) => { - self.nm_state.known_vpns = index_map; - } Message::Refresh => { - if let Some(conn) = self.conn.clone() { - return Task::batch(vec![ - update_state(conn.clone()), - update_devices(conn.clone()), - load_vpns(conn), - ]) - .map(cosmic::Action::App); - } + return snapshot_task().map(cosmic::Action::App); } Message::ToggleVPNPasswordVisibility => { if let Some(requested_vpn) = self.nm_state.requested_vpn.as_mut() { @@ -1546,7 +1613,7 @@ impl cosmic::Application for CosmicNetworkApplet { .icon_size(16) .on_press(Message::ResetFailedKnownSsid( name.clone(), - HwAddress::from_str(hw_address).unwrap(), + HwAddress::from_str(hw_address).unwrap_or_default(), )) .into(), ); @@ -1561,7 +1628,7 @@ impl cosmic::Application for CosmicNetworkApplet { ) .on_press(Message::Disconnect( Arc::from(name.as_str()), - HwAddress::from_str(hw_address).unwrap(), + HwAddress::from_str(hw_address).unwrap_or_default(), )), )]) .align_x(Alignment::Center), @@ -1674,7 +1741,7 @@ impl cosmic::Application for CosmicNetworkApplet { .nm_state .devices .iter() - .filter(|d| matches!(d.device_type, network_manager::devices::DeviceType::Wifi)) + .filter(|d| matches!(d.device_type, DeviceType::Wifi)) .collect::>(); if wireless_hw_devices.len() > 1 && self.active_device.is_none() { @@ -1852,7 +1919,7 @@ impl cosmic::Application for CosmicNetworkApplet { ); content = content.push(id); - let is_enterprise = matches!(access_point.network_type, NetworkType::EAP); + let is_enterprise = matches!(access_point.network_type, NetworkType::Eap); let enter_password_col = cosmic::widget::column::with_capacity(4) .push_maybe(is_enterprise.then(|| text::body(fl!("identity")))) .push_maybe(is_enterprise.then(|| { @@ -2032,7 +2099,9 @@ impl cosmic::Application for CosmicNetworkApplet { fn active_conn_hw_address(conn: &ActiveConnectionInfo) -> HwAddress { match conn { ActiveConnectionInfo::Wired { hw_address, .. } - | ActiveConnectionInfo::WiFi { hw_address, .. } => HwAddress::from_str(hw_address).unwrap(), + | ActiveConnectionInfo::WiFi { hw_address, .. } => { + HwAddress::from_str(hw_address).unwrap_or_default() + } ActiveConnectionInfo::Vpn { .. } => HwAddress::default(), } } diff --git a/cosmic-applet-network/src/lib.rs b/cosmic-applet-network/src/lib.rs index 7d5414a5..f1ce1c6e 100644 --- a/cosmic-applet-network/src/lib.rs +++ b/cosmic-applet-network/src/lib.rs @@ -3,7 +3,6 @@ mod app; mod config; mod localize; -mod utils; use crate::localize::localize;