unifi-cli 0.3.2__tar.gz → 0.3.4__tar.gz

{unifi_cli-0.3.2 → unifi_cli-0.3.4}/CHANGELOG.md

@@ -2,6 +2,38 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.3.4](https://github.com/rvben/unifi-cli/compare/v0.3.3...v0.3.4) - 2026-08-11
+
+### Breaking Changes
+
+- **protect**: wrap the camera list in the standard items envelope ([e7b77bf](https://github.com/rvben/unifi-cli/commit/e7b77bf06dc64def4de1312bd3a5d6a207e60262))
+
+### Added
+
+- **protect**: wrap the camera list in the standard items envelope ([e7b77bf](https://github.com/rvben/unifi-cli/commit/e7b77bf06dc64def4de1312bd3a5d6a207e60262))
+
+### Fixed
+
+- **devices**: emit the firmware field devices show declares ([0f007c1](https://github.com/rvben/unifi-cli/commit/0f007c186a285b7250d5a539cebc1b561ba2be80))
+- **system**: report an unchecked update state as unknown, not up to date ([38492bb](https://github.com/rvben/unifi-cli/commit/38492bb6ff45f62e234bcc7409180b683f9a64c0))
+- **protect**: make the remaining reported-flag defaults tri-state ([4decf08](https://github.com/rvben/unifi-cli/commit/4decf08b38a7ed1ef31cfa792d492f3bfc5df76e))
+- **clients**: rank and print unknown traffic as unknown, not zero ([cbe0b66](https://github.com/rvben/unifi-cli/commit/cbe0b663fd9529c918c40a91f27e1b504e674984))
+- **schema**: publish the fields that say an rtsps create was partial ([9eb083e](https://github.com/rvben/unifi-cli/commit/9eb083e2031e192fceec6bbb1aa09c2fac5a3055))
+- **protect**: stop turning absent camera data into confident values ([29cf091](https://github.com/rvben/unifi-cli/commit/29cf091955b5452814957961b066ff4ddc41a8e0))
+- **tui**: let a throughput measurement expire instead of standing forever ([d7ca1f8](https://github.com/rvben/unifi-cli/commit/d7ca1f8499461990d6390427cdffa071716ecec8))
+- **tui**: stop reporting throughput for a port whose link has gone down ([00a18d8](https://github.com/rvben/unifi-cli/commit/00a18d811e969697b78e7260e5515715c336df3e))
+- **tui**: measure port throughput over the window the counters actually changed ([b2ae602](https://github.com/rvben/unifi-cli/commit/b2ae60228f1d8be44a2ae158a4b8a840d371d8fd))
+- **cli**: exit quietly when the output pipe closes early ([518fd96](https://github.com/rvben/unifi-cli/commit/518fd963f9c6eaf21b994ec6439ffa16cb6097a9))
+- **tui**: aim overlay actions at the entity the panel was opened on ([43fdd32](https://github.com/rvben/unifi-cli/commit/43fdd32abfa71fe1a1e7810e87af9c1033deb224))
+- **events**: report an absent event surface as unsupported, not a rejected request ([b3be651](https://github.com/rvben/unifi-cli/commit/b3be65186c65dd0d5849c47f388da63d5eb3a347))
+
+## [0.3.3](https://github.com/rvben/unifi-cli/compare/v0.3.2...v0.3.3) - 2026-08-10
+
+### Fixed
+
+- **api**: decode a response body before judging its content type ([0e49404](https://github.com/rvben/unifi-cli/commit/0e4940467e428f4cea20f54c1eafbc337b6cca00))
+- **api**: report an absent controller application as unsupported ([0f5384c](https://github.com/rvben/unifi-cli/commit/0f5384c84caccc3dfcbf5b5b63831cd97eca55b5))
+
 ## [0.3.2](https://github.com/rvben/unifi-cli/compare/v0.3.1...v0.3.2) - 2026-08-10
 
 ### Fixed
@@ -130,7 +162,7 @@ Thanks to [@l3wi](https://github.com/l3wi) for reporting the TLS certificate val
 - TUI: device panel shows all devices without scrolling, cursor moves through items
 - TUI: client list viewport follows cursor instead of cursor staying at top
 - CLI: dynamic column widths adapt to data instead of fixed widths causing misalignment
-- CLI: MAC suffixes stripped from display names (e.g., "garage-bluetooth-proxy" instead of "garage-bluetooth-proxy 43:3c")
+- CLI: MAC suffixes stripped from display names (e.g., "lobby-bluetooth-proxy" instead of "lobby-bluetooth-proxy 43:3c")
 
 ### Changed
 - TUI: overlay shortcut hints moved from footer to overlay bottom border

{unifi_cli-0.3.2 → unifi_cli-0.3.4}/Cargo.lock

@@ -2786,13 +2786,14 @@ checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "unifi-cli"
-version = "0.3.2"
+version = "0.3.4"
 dependencies = [
  "clap",
  "clap_complete",
  "crossterm",
  "dirs",
  "jsonschema",
+ "libc",
  "owo-colors",
  "ratatui",
  "reqwest",

{unifi_cli-0.3.2 → unifi_cli-0.3.4}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "unifi-cli"
-version = "0.3.2"
+version = "0.3.4"
 edition = "2024"
 rust-version = "1.90"
 description = "CLI for UniFi Network controller"
@@ -33,6 +33,9 @@ ratatui = "0.30"
 crossterm = "0.29"
 rpassword = "7.4.0"
 
+[target.'cfg(unix)'.dependencies]
+libc = "0.2"
+
 [dev-dependencies]
 tempfile = "3"
 wiremock = "0.6"

{unifi_cli-0.3.2 → unifi_cli-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unifi-cli
-Version: 0.3.2
+Version: 0.3.4
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
 Classifier: Intended Audience :: System Administrators
@@ -357,6 +357,7 @@ unifi schema    # Dumps all commands, arguments, output fields as JSON
 | 2 | `confirmation_required` | A destructive command ran without `--yes` and without a TTY |
 | 3 | `auth_error` | Authentication error (401/403) |
 | 4 | `not_found` | Not found (404) |
+| 4 | `unsupported` | The controller does not serve this endpoint at all: it answered a JSON endpoint with HTML (how UniFi OS reports an application it does not have) or rejected the endpoint itself (how UniFi Network reports one the firmware has dropped); unlike `not_found` there is no other identifier or parameter worth trying |
 | 5 | `client_error` | The controller rejected the request itself (4xx other than 401/403/404/408/429); retrying it unchanged cannot help |
 | 5 | `retry_later` | The controller invited a retry (429 rate limited, 408 request timeout); back off and send the same request again |
 | 5 | `api_error` | The controller failed to serve the request (5xx); may be transient |

{unifi_cli-0.3.2 → unifi_cli-0.3.4}/README.md

@@ -336,6 +336,7 @@ unifi schema    # Dumps all commands, arguments, output fields as JSON
 | 2 | `confirmation_required` | A destructive command ran without `--yes` and without a TTY |
 | 3 | `auth_error` | Authentication error (401/403) |
 | 4 | `not_found` | Not found (404) |
+| 4 | `unsupported` | The controller does not serve this endpoint at all: it answered a JSON endpoint with HTML (how UniFi OS reports an application it does not have) or rejected the endpoint itself (how UniFi Network reports one the firmware has dropped); unlike `not_found` there is no other identifier or parameter worth trying |
 | 5 | `client_error` | The controller rejected the request itself (4xx other than 401/403/404/408/429); retrying it unchanged cannot help |
 | 5 | `retry_later` | The controller invited a retry (429 rate limited, 408 request timeout); back off and send the same request again |
 | 5 | `api_error` | The controller failed to serve the request (5xx); may be transient |

{unifi_cli-0.3.2 → unifi_cli-0.3.4}/src/api/client.rs

@@ -11,6 +11,72 @@ pub fn error_for_status(status: u16, message: String) -> ApiError {
     }
 }
 
+/// True when a legacy API error means the endpoint itself is not there.
+///
+/// UniFi Network answers an unknown `stat/` path with 404 `api.err.NotFound`
+/// and an unknown `rest/` resource with 400 `api.err.InvalidObject`, verified
+/// against a UniFi OS 9 controller by control: a nonsense resource and
+/// `rest/alarm` produce byte-identical 400s while `rest/networkconf` returns
+/// records.
+///
+/// A 400 alone does not carry that meaning, since the same status reports a
+/// genuinely malformed request, so the marker string is required too and this
+/// is only consulted for a request that carries no caller-supplied body or
+/// parameters that could be the invalid object.
+fn is_absent_legacy_endpoint(err: &ApiError) -> bool {
+    match err {
+        ApiError::NotFound(_) => true,
+        ApiError::Api {
+            status: 400,
+            message,
+        } => message.contains("api.err.InvalidObject"),
+        _ => false,
+    }
+}
+
+/// Decode a successful response as JSON, naming what answered when it is not.
+///
+/// UniFi OS answers a request for an application the controller does not have
+/// by proxying it to the web UI, which returns 200 with an HTML page. Decoding
+/// that as JSON produces "error decoding response body", which names neither
+/// the endpoint nor the reason, so the caller cannot tell a missing application
+/// from a transport fault worth retrying.
+///
+/// The body is decoded first and the content type only chooses the error for a
+/// body that did not decode: a controller or proxy that serves JSON under
+/// `text/plain` or under no content type at all is still answering the request,
+/// so it must not be reported as an application that is not there.
+async fn json_or_unsupported<T: DeserializeOwned>(
+    resp: reqwest::Response,
+    endpoint: &str,
+) -> Result<T, ApiError> {
+    let raw = resp
+        .headers()
+        .get(reqwest::header::CONTENT_TYPE)
+        .and_then(|v| v.to_str().ok())
+        .unwrap_or("")
+        .to_string();
+    let bytes = resp.bytes().await?;
+    match serde_json::from_slice(&bytes) {
+        Ok(value) => Ok(value),
+        // A body that claims to be JSON and is not is a fault in a controller
+        // that does serve this endpoint, which is a different thing entirely.
+        Err(e) if raw.to_ascii_lowercase().contains("json") => Err(ApiError::Other(format!(
+            "Failed to decode the response from {endpoint}: {e}"
+        ))),
+        Err(_) => {
+            let content_type = match raw.split(';').next().map(str::trim) {
+                Some(t) if !t.is_empty() => t.to_string(),
+                _ => "no content type".to_string(),
+            };
+            Err(ApiError::Unsupported {
+                endpoint: endpoint.to_string(),
+                reason: UnsupportedReason::NotJson { content_type },
+            })
+        }
+    }
+}
+
 /// Valid RTSPS quality levels accepted by the Protect API.
 const VALID_QUALITIES: &[&str] = &["high", "medium", "low", "package"];
 
@@ -120,18 +186,19 @@ impl UnifiClient {
             let body = resp.text().await.unwrap_or_default();
             return Err(error_for_status(status, body));
         }
-        Ok(resp.json().await?)
+        json_or_unsupported(resp, path).await
     }
 
     async fn get_legacy<T: DeserializeOwned>(&self, path: &str) -> Result<Vec<T>, ApiError> {
-        let url = format!("{}/proxy/network/api/s/default{path}", self.base_url);
+        let endpoint = format!("/proxy/network/api/s/default{path}");
+        let url = format!("{}{endpoint}", self.base_url);
         let resp = self.http.get(&url).send().await?;
         let status = resp.status().as_u16();
         if !resp.status().is_success() {
             let body = resp.text().await.unwrap_or_default();
             return Err(error_for_status(status, body));
         }
-        let legacy: LegacyResponse<T> = resp.json().await?;
+        let legacy: LegacyResponse<T> = json_or_unsupported(resp, &endpoint).await?;
         if legacy.meta.rc != "ok" {
             return Err(ApiError::Api {
                 status: 200,
@@ -146,17 +213,15 @@ impl UnifiClient {
         manager: &str,
         body: serde_json::Value,
     ) -> Result<serde_json::Value, ApiError> {
-        let url = format!(
-            "{}/proxy/network/api/s/default/cmd/{manager}",
-            self.base_url
-        );
+        let endpoint = format!("/proxy/network/api/s/default/cmd/{manager}");
+        let url = format!("{}{endpoint}", self.base_url);
         let resp = self.http.post(&url).json(&body).send().await?;
         let status = resp.status().as_u16();
         if !resp.status().is_success() {
             let body = resp.text().await.unwrap_or_default();
             return Err(error_for_status(status, body));
         }
-        Ok(resp.json().await?)
+        json_or_unsupported(resp, &endpoint).await
     }
 
     async fn put_legacy<T: serde::Serialize>(
@@ -164,14 +229,15 @@ impl UnifiClient {
         path: &str,
         body: &T,
     ) -> Result<serde_json::Value, ApiError> {
-        let url = format!("{}/proxy/network/api/s/default{path}", self.base_url);
+        let endpoint = format!("/proxy/network/api/s/default{path}");
+        let url = format!("{}{endpoint}", self.base_url);
         let resp = self.http.put(&url).json(body).send().await?;
         let status = resp.status().as_u16();
         if !resp.status().is_success() {
             let body = resp.text().await.unwrap_or_default();
             return Err(error_for_status(status, body));
         }
-        Ok(resp.json().await?)
+        json_or_unsupported(resp, &endpoint).await
     }
 
     async fn post_legacy<T: serde::Serialize>(
@@ -179,14 +245,15 @@ impl UnifiClient {
         path: &str,
         body: &T,
     ) -> Result<serde_json::Value, ApiError> {
-        let url = format!("{}/proxy/network/api/s/default{path}", self.base_url);
+        let endpoint = format!("/proxy/network/api/s/default{path}");
+        let url = format!("{}{endpoint}", self.base_url);
         let resp = self.http.post(&url).json(body).send().await?;
         let status = resp.status().as_u16();
         if !resp.status().is_success() {
             let body = resp.text().await.unwrap_or_default();
             return Err(error_for_status(status, body));
         }
-        Ok(resp.json().await?)
+        json_or_unsupported(resp, &endpoint).await
     }
 
     // Paginate through all results from Integration API
@@ -386,21 +453,30 @@ impl UnifiClient {
     // `Event` shape, so fall back to it. (The full live event stream on newer
     // controllers is only exposed over the events WebSocket, which this REST
     // client does not consume.)
+    //
+    // Some UniFi Network 9 builds serve neither. Reporting the fallback's own
+    // rejection verbatim would tell a caller that its request was malformed and
+    // invite it to retry with different parameters, when in truth the whole
+    // event surface is gone and nothing it can send would work.
     pub async fn list_events(&self, limit: usize) -> Result<Vec<Event>, ApiError> {
-        match self
-            .get_legacy::<Event>(&format!("/stat/event?_limit={limit}"))
-            .await
-        {
+        let events_path = format!("/stat/event?_limit={limit}");
+        match self.get_legacy::<Event>(&events_path).await {
             Ok(events) => Ok(events),
-            Err(ApiError::NotFound(_)) => {
-                let mut alarms: Vec<Event> = self.get_legacy("/rest/alarm").await?;
+            Err(ApiError::NotFound(_)) => match self.get_legacy::<Event>("/rest/alarm").await {
                 // `rest/alarm` is neither time-ordered nor limited server-side;
                 // present the most recent `limit` records to match the
                 // semantics `stat/event?_limit=` provided on older controllers.
-                alarms.sort_by_key(|e| std::cmp::Reverse(e.time));
-                alarms.truncate(limit);
-                Ok(alarms)
-            }
+                Ok(mut alarms) => {
+                    alarms.sort_by_key(|e| std::cmp::Reverse(e.time));
+                    alarms.truncate(limit);
+                    Ok(alarms)
+                }
+                Err(e) if is_absent_legacy_endpoint(&e) => Err(ApiError::Unsupported {
+                    endpoint: format!("/proxy/network/api/s/default{events_path}"),
+                    reason: UnsupportedReason::Removed,
+                }),
+                Err(e) => Err(e),
+            },
             Err(e) => Err(e),
         }
     }
@@ -467,10 +543,8 @@ impl UnifiClient {
         qualities: &[String],
     ) -> Result<RtspsStreams, ApiError> {
         validate_qualities(qualities)?;
-        let url = format!(
-            "{}/proxy/protect/integration/v1/cameras/{camera_id}/rtsps-stream",
-            self.base_url
-        );
+        let endpoint = format!("/proxy/protect/integration/v1/cameras/{camera_id}/rtsps-stream");
+        let url = format!("{}{endpoint}", self.base_url);
         let body = serde_json::json!({ "qualities": qualities });
         let resp = self.http.post(&url).json(&body).send().await?;
         let status = resp.status().as_u16();
@@ -478,7 +552,7 @@ impl UnifiClient {
             let body = resp.text().await.unwrap_or_default();
             return Err(error_for_status(status, body));
         }
-        Ok(resp.json().await?)
+        json_or_unsupported(resp, &endpoint).await
     }
 
     /// Delete RTSPS streams for a camera at the specified quality levels.
@@ -509,6 +583,11 @@ impl UnifiClient {
     /// Resolve a camera identifier (ID or name) to a camera ID.
     /// If the input is a 24-char hex string, treats it as an ID.
     /// Otherwise, searches by name (case-insensitive).
+    ///
+    /// A name that fits more than one camera is an error rather than a choice
+    /// made silently: the caller may be about to delete that camera's streams,
+    /// and picking whichever the controller happened to list first would act on
+    /// a different camera than the one the user was asked to confirm.
     pub async fn resolve_camera_id(&self, id_or_name: &str) -> Result<String, ApiError> {
         // If it looks like a Protect camera ID (24 hex chars), use it directly
         if id_or_name.len() == 24 && id_or_name.chars().all(|c| c.is_ascii_hexdigit()) {
@@ -517,15 +596,30 @@ impl UnifiClient {
         // Otherwise, search by name
         let cameras = self.list_protect_cameras().await?;
         let needle = id_or_name.to_lowercase();
-        cameras
+        let mut matches: Vec<ProtectCamera> = cameras
             .into_iter()
-            .find(|c| {
+            .filter(|c| {
                 c.name
                     .as_deref()
                     .is_some_and(|n| n.trim().to_lowercase() == needle)
             })
-            .map(|c| c.id)
-            .ok_or_else(|| ApiError::NotFound(format!("Camera '{id_or_name}'")))
+            .collect();
+
+        match matches.len() {
+            0 => Err(ApiError::NotFound(format!("Camera '{id_or_name}'"))),
+            1 => Ok(matches.pop().expect("checked len == 1 above").id),
+            _ => {
+                let list = matches
+                    .iter()
+                    .map(|c| c.id.as_str())
+                    .collect::<Vec<_>>()
+                    .join(", ");
+                Err(ApiError::Conflict(format!(
+                    "'{id_or_name}' matches {} cameras: {list}. Use the ID.",
+                    matches.len()
+                )))
+            }
+        }
     }
 
     // System
@@ -547,7 +641,7 @@ impl UnifiClient {
             let body = resp.text().await.unwrap_or_default();
             return Err(error_for_status(status, body));
         }
-        Ok(resp.json().await?)
+        json_or_unsupported(resp, "/api/system").await
     }
 }
 
@@ -637,7 +731,8 @@ impl ProtectSession {
 
     /// GET from the direct Protect API (cookie-authenticated).
     pub async fn get<T: DeserializeOwned>(&self, path: &str) -> Result<T, ApiError> {
-        let url = format!("{}/proxy/protect/api{path}", self.base_url);
+        let endpoint = format!("/proxy/protect/api{path}");
+        let url = format!("{}{endpoint}", self.base_url);
         let mut req = self
             .http
             .get(&url)
@@ -651,9 +746,7 @@ impl ProtectSession {
             let body = resp.text().await.unwrap_or_default();
             return Err(error_for_status(status, body));
         }
-        let bytes = resp.bytes().await.map_err(ApiError::Http)?;
-        serde_json::from_slice(&bytes)
-            .map_err(|e| ApiError::Other(format!("JSON parse error: {e}")))
+        json_or_unsupported(resp, &endpoint).await
     }
 
     /// List all cameras from the direct Protect API (full objects).

{unifi_cli-0.3.2 → unifi_cli-0.3.4}/src/api/mod.rs

@@ -7,6 +7,6 @@ pub use client::UnifiClient;
 pub use client::error_for_status;
 pub use types::{
     ApiError, Client, Device, DeviceWithPorts, Event, HealthSubsystem, HostSystem, LastConnection,
-    LegacyClient, LegacyDevice, LegacyResponse, Network, PortEntry, SysInfo, format_bytes,
-    format_mac, format_uptime, normalize_mac,
+    LegacyClient, LegacyDevice, LegacyResponse, Network, PortEntry, SysInfo, UnsupportedReason,
+    format_bytes, format_mac, format_uptime, normalize_mac,
 };

{unifi_cli-0.3.2 → unifi_cli-0.3.4}/src/api/tests.rs

@@ -172,8 +172,8 @@ fn deserialize_paginated_response() {
         "count": 2,
         "totalCount": 2,
         "data": [
-            {"macAddress": "aa:bb:cc:dd:ee:ff", "ipAddress": "10.0.0.1", "name": "Test", "type": "WIRED"},
-            {"macAddress": "11:22:33:44:55:66", "ipAddress": "10.0.0.2", "hostname": "host2", "type": "WIRELESS"}
+            {"macAddress": "aa:bb:cc:dd:ee:ff", "ipAddress": "192.0.2.1", "name": "Test", "type": "WIRED"},
+            {"macAddress": "11:22:33:44:55:66", "ipAddress": "192.0.2.2", "hostname": "host2", "type": "WIRELESS"}
         ]
     }"#;
     let resp: PaginatedResponse<Client> = serde_json::from_str(json).unwrap();
@@ -210,7 +210,7 @@ fn deserialize_legacy_response_ok() {
     let json = r#"{
         "meta": {"rc": "ok"},
         "data": [
-            {"_id": "abc123", "mac": "aa:bb:cc:dd:ee:ff", "ip": "10.0.0.1", "is_wired": true}
+            {"_id": "abc123", "mac": "aa:bb:cc:dd:ee:ff", "ip": "192.0.2.1", "is_wired": true}
         ]
     }"#;
     let resp: LegacyResponse<LegacyClient> = serde_json::from_str(json).unwrap();
@@ -237,15 +237,15 @@ fn deserialize_legacy_response_error() {
 #[test]
 fn deserialize_client_all_fields() {
     let json = r#"{
-        "macAddress": "d0:11:e5:ce:d5:54",
-        "ipAddress": "192.168.1.180",
+        "macAddress": "aa:bb:cc:dd:d5:54",
+        "ipAddress": "198.51.100.180",
         "name": "Mac Mini",
         "hostname": "mac-mini",
         "type": "WIRED"
     }"#;
     let client: Client = serde_json::from_str(json).unwrap();
-    assert_eq!(client.mac_address.as_deref(), Some("d0:11:e5:ce:d5:54"));
-    assert_eq!(client.ip_address.as_deref(), Some("192.168.1.180"));
+    assert_eq!(client.mac_address.as_deref(), Some("aa:bb:cc:dd:d5:54"));
+    assert_eq!(client.ip_address.as_deref(), Some("198.51.100.180"));
     assert_eq!(client.name.as_deref(), Some("Mac Mini"));
     assert_eq!(client.hostname.as_deref(), Some("mac-mini"));
     assert_eq!(client.client_type.as_deref(), Some("WIRED"));
@@ -290,7 +290,7 @@ fn deserialize_legacy_client_full() {
     let json = r#"{
         "_id": "67890",
         "mac": "aa:bb:cc:dd:ee:ff",
-        "ip": "10.0.0.5",
+        "ip": "192.0.2.5",
         "hostname": "myhost",
         "name": "My Client",
         "is_wired": false,
@@ -298,8 +298,8 @@ fn deserialize_legacy_client_full() {
         "tx_bytes": 1048576,
         "rx_bytes": 2097152,
         "signal": -55,
-        "ap_mac": "60:22:32:58:b8:00",
-        "essid": "Notwork"
+        "ap_mac": "aa:bb:cc:dd:b8:00",
+        "essid": "GuestNet"
     }"#;
     let client: LegacyClient = serde_json::from_str(json).unwrap();
     assert_eq!(client.id, "67890");
@@ -309,8 +309,8 @@ fn deserialize_legacy_client_full() {
     assert_eq!(client.tx_bytes, Some(1048576));
     assert_eq!(client.rx_bytes, Some(2097152));
     assert_eq!(client.signal, Some(-55));
-    assert_eq!(client.ap_mac.as_deref(), Some("60:22:32:58:b8:00"));
-    assert_eq!(client.ssid.as_deref(), Some("Notwork"));
+    assert_eq!(client.ap_mac.as_deref(), Some("aa:bb:cc:dd:b8:00"));
+    assert_eq!(client.ssid.as_deref(), Some("GuestNet"));
 }
 
 #[test]
@@ -351,15 +351,15 @@ fn deserialize_site() {
 #[test]
 fn deserialize_device() {
     let json = r#"{
-        "macAddress": "9c:05:d6:bc:06:43",
-        "ipAddress": "192.168.1.1",
+        "macAddress": "aa:bb:cc:dd:06:43",
+        "ipAddress": "198.51.100.1",
         "name": "UCG Ultra",
         "model": "UCG Ultra",
         "state": "ONLINE",
         "firmwareVersion": "5.0.12"
     }"#;
     let device: Device = serde_json::from_str(json).unwrap();
-    assert_eq!(device.mac_address.as_deref(), Some("9c:05:d6:bc:06:43"));
+    assert_eq!(device.mac_address.as_deref(), Some("aa:bb:cc:dd:06:43"));
     assert_eq!(device.name.as_deref(), Some("UCG Ultra"));
     assert_eq!(device.state.as_deref(), Some("ONLINE"));
     assert_eq!(device.firmware_version.as_deref(), Some("5.0.12"));
@@ -406,14 +406,14 @@ fn deserialize_health_wan() {
     let json = r#"{
         "subsystem": "wan",
         "status": "ok",
-        "wan_ip": "81.172.153.156",
-        "isp_name": "Caiway NL"
+        "wan_ip": "203.0.113.156",
+        "isp_name": "ExampleISP NL"
     }"#;
     let health: HealthSubsystem = serde_json::from_str(json).unwrap();
     assert_eq!(health.subsystem, "wan");
     assert_eq!(health.status.as_deref(), Some("ok"));
-    assert_eq!(health.wan_ip.as_deref(), Some("81.172.153.156"));
-    assert_eq!(health.isp_name.as_deref(), Some("Caiway NL"));
+    assert_eq!(health.wan_ip.as_deref(), Some("203.0.113.156"));
+    assert_eq!(health.isp_name.as_deref(), Some("ExampleISP NL"));
 }
 
 #[test]
@@ -472,7 +472,7 @@ fn deserialize_sysinfo_minimal() {
 fn deserialize_event() {
     let json = r#"{
         "key": "EVT_AP_Connected",
-        "msg": "AP[80:2a:a8:cd:47:ab] was connected",
+        "msg": "AP[aa:bb:cc:dd:47:ab] was connected",
         "subsystem": "wlan",
         "time": 1710886800,
         "datetime": "2026-03-19T12:00:00Z"
@@ -554,7 +554,7 @@ fn deserialize_port_entry_minimal() {
 #[test]
 fn deserialize_device_with_ports() {
     let json = r#"{
-        "mac": "9c:05:d6:bc:06:43",
+        "mac": "aa:bb:cc:dd:06:43",
         "name": "USW-24-PoE",
         "model": "USW-24-PoE",
         "port_table": [
@@ -581,8 +581,8 @@ fn deserialize_device_with_empty_port_table() {
 #[test]
 fn deserialize_legacy_device() {
     let json = r#"{
-        "mac": "9c:05:d6:bc:06:43",
-        "ip": "192.168.1.1",
+        "mac": "aa:bb:cc:dd:06:43",
+        "ip": "198.51.100.1",
         "name": "UCG Ultra",
         "model": "UCG Ultra",
         "type": "ugw",
@@ -592,7 +592,7 @@ fn deserialize_legacy_device() {
         "num_sta": 42
     }"#;
     let device: LegacyDevice = serde_json::from_str(json).unwrap();
-    assert_eq!(device.mac.as_deref(), Some("9c:05:d6:bc:06:43"));
+    assert_eq!(device.mac.as_deref(), Some("aa:bb:cc:dd:06:43"));
     assert_eq!(device.name.as_deref(), Some("UCG Ultra"));
     assert_eq!(device.state, Some(1));
     assert_eq!(device.state_str(), "ONLINE");
@@ -650,7 +650,7 @@ fn legacy_device_upgradable_false_explicit() {
 fn host_system_update_available() {
     let json = r#"{"deviceState": "updateAvailable", "name": "UCG Ultra"}"#;
     let host: HostSystem = serde_json::from_str(json).unwrap();
-    assert!(host.update_available());
+    assert_eq!(host.update_available(), Some(true));
     assert_eq!(host.name.as_deref(), Some("UCG Ultra"));
 }
 
@@ -658,14 +658,18 @@ fn host_system_update_available() {
 fn host_system_no_update() {
     let json = r#"{"deviceState": "online"}"#;
     let host: HostSystem = serde_json::from_str(json).unwrap();
-    assert!(!host.update_available());
+    assert_eq!(host.update_available(), Some(false));
 }
 
 #[test]
-fn host_system_missing_state() {
+fn host_system_missing_state_is_unknown_not_up_to_date() {
     let json = r#"{}"#;
     let host: HostSystem = serde_json::from_str(json).unwrap();
-    assert!(!host.update_available());
+    assert_eq!(
+        host.update_available(),
+        None,
+        "a host that reported no device state has not reported an up-to-date one"
+    );
 }
 
 // --- strip_mac_suffix ---
@@ -674,8 +678,8 @@ fn host_system_missing_state() {
 fn strip_mac_suffix_removes_colon_suffix() {
     // MAC aa:bb:cc:dd:ee:ff → suffix " ee:ff"
     assert_eq!(
-        strip_mac_suffix("garage-bluetooth-proxy ee:ff", Some("aa:bb:cc:dd:ee:ff")),
-        "garage-bluetooth-proxy"
+        strip_mac_suffix("lobby-bluetooth-proxy ee:ff", Some("aa:bb:cc:dd:ee:ff")),
+        "lobby-bluetooth-proxy"
     );
 }
 
@@ -683,8 +687,8 @@ fn strip_mac_suffix_removes_colon_suffix() {
 fn strip_mac_suffix_removes_no_colon_suffix() {
     // Also matches " eeff" without colon
     assert_eq!(
-        strip_mac_suffix("garage-bluetooth-proxy eeff", Some("aa:bb:cc:dd:ee:ff")),
-        "garage-bluetooth-proxy"
+        strip_mac_suffix("lobby-bluetooth-proxy eeff", Some("aa:bb:cc:dd:ee:ff")),
+        "lobby-bluetooth-proxy"
     );
 }