fix: Make more stuff optional. 0.4.1

Author: JudahZF

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "rustifi"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2024"
 authors = ["Judah Fuller <[email protected]>"]
 description = "Open source rust library to interface with Ubiquiti's Unifi Controller."

Cargo.toml

@@ -2,7 +2,7 @@ mod models;
 
 use crate::responses::stat::devices::RawDevice;
 use crate::types::{
-    ConfigNet, InterfaceUserStats, SystemStats, Temperature, Uplink, UserStats, Version, IP,
+    ConfigNet, IP, InterfaceUserStats, SystemStats, Temperature, Uplink, UserStats, Version,
 };
 use chrono::prelude::*;
 use models::DeviceType;
@@ -75,21 +75,28 @@ impl From<RawDevice> for Device {
             name: raw.name,
             config_network: ConfigNet::from(raw.config_network),
             ip: IP::from(raw.ip),
-            connected_at: DateTime::from_timestamp(raw.connected_at, 0).expect("Invalid timestamp"),
-            provisioned_at: DateTime::from_timestamp(raw.provisioned_at, 0)
-                .expect("Invalid timestamp"),
-            disconnected_at: DateTime::from_timestamp(raw.disconnected_at, 0)
-                .expect("Invalid timestamp"),
-            startup_time: DateTime::from_timestamp(
-                raw.startup_timestamp.unwrap_or_default(),
+            connected_at: DateTime::from_timestamp(
+                match raw.connected_at {
+                    Some(ts) => ts,
+                    None => 0,
+                },
                 0,
             )
             .expect("Invalid timestamp"),
-            last_seen: DateTime::from_timestamp(
-                raw.last_seen.unwrap_or_default(),
+            provisioned_at: DateTime::from_timestamp(raw.provisioned_at, 0)
+                .expect("Invalid timestamp"),
+            disconnected_at: DateTime::from_timestamp(
+                match raw.disconnected_at {
+                    Some(ts) => ts,
+                    None => 0,
+                },
                 0,
             )
             .expect("Invalid timestamp"),
+            startup_time: DateTime::from_timestamp(raw.startup_timestamp.unwrap_or_default(), 0)
+                .expect("Invalid timestamp"),
+            last_seen: DateTime::from_timestamp(raw.last_seen.unwrap_or_default(), 0)
+                .expect("Invalid timestamp"),
             serial: match raw.serial {
                 Some(s) => s,
                 None => "".to_string(),

src/device/mod.rs

@@ -2,8 +2,8 @@ mod models;
 
 use crate::responses::stat::devices::RawDevice;
 use crate::types::{
-    Antenna, ConfigNet, InterfaceUserStats, Port, Radio, SystemStats, Temperature, Uplink,
-    UserStats, Version, IP,
+    Antenna, ConfigNet, IP, InterfaceUserStats, Port, Radio, SystemStats, Temperature, Uplink,
+    UserStats, Version,
 };
 use chrono::prelude::*;
 
@@ -81,21 +81,28 @@ impl From<RawDevice> for AccessPoint {
             name: raw.name,
             config_network: ConfigNet::from(raw.config_network),
             ip: IP::from(raw.ip),
-            connected_at: DateTime::from_timestamp(raw.connected_at, 0).expect("Invalid timestamp"),
-            provisioned_at: DateTime::from_timestamp(raw.provisioned_at, 0)
-                .expect("Invalid timestamp"),
-            disconnected_at: DateTime::from_timestamp(raw.disconnected_at, 0)
-                .expect("Invalid timestamp"),
-            startup_time: DateTime::from_timestamp(
-                raw.startup_timestamp.unwrap_or_default(),
+            connected_at: DateTime::from_timestamp(
+                match raw.connected_at {
+                    Some(ts) => ts,
+                    None => 0,
+                },
                 0,
             )
             .expect("Invalid timestamp"),
-            last_seen: DateTime::from_timestamp(
-                raw.last_seen.unwrap_or_default(),
+            provisioned_at: DateTime::from_timestamp(raw.provisioned_at, 0)
+                .expect("Invalid timestamp"),
+            disconnected_at: DateTime::from_timestamp(
+                match raw.disconnected_at {
+                    Some(ts) => ts,
+                    None => 0,
+                },
                 0,
             )
             .expect("Invalid timestamp"),
+            startup_time: DateTime::from_timestamp(raw.startup_timestamp.unwrap_or_default(), 0)
+                .expect("Invalid timestamp"),
+            last_seen: DateTime::from_timestamp(raw.last_seen.unwrap_or_default(), 0)
+                .expect("Invalid timestamp"),
             serial: match raw.serial {
                 Some(s) => s,
                 None => "".to_string(),

src/device/models/access_points/mod.rs

@@ -54,7 +54,7 @@ pub struct RawDevice {
     pub mgmt_network_id: Option<String>,
     pub gateway_mac: Option<String>,
     pub external_id: Option<String>,
-    pub connected_at: i64,
+    pub connected_at: Option<i64>,
     pub two_phase_adopt: Option<bool>,
     #[serde(default)]
     pub port_overrides: Option<Vec<PortOverride>>,
@@ -74,7 +74,7 @@ pub struct RawDevice {
     pub last_uplink: LastUplink,
     pub led_override: Option<String>,
     pub ether_lighting: Option<EtherLighting>,
-    pub disconnected_at: i64,
+    pub disconnected_at: Option<i64>,
     pub architecture: Option<String>,
     pub x_aes_gcm: Option<bool>,
     pub has_fan: Option<bool>,
@@ -455,7 +455,7 @@ pub struct RadioTable {
     pub channel: Value,
     pub antenna_gain: u16,
     pub builtin_antenna: bool,
-    pub vwire_enabled: bool,
+    pub vwire_enabled: Option<bool>,
     pub hard_noise_floor_enabled: Option<bool>,
     pub sens_level_enabled: Option<bool>,
     pub max_txpower: u16,

src/responses/stat/devices.rs

@@ -41,9 +41,13 @@ impl Site {
             Ok(response) => {
                 let mut aps: Vec<AccessPoint> = Vec::new();
                 let mut switches: Vec<Device> = Vec::new();
-                let response = match response.json::<DeviceListResponse>().await {
+                let resp_text = response.text().await.unwrap();
+                let response = match serde_json::from_str::<DeviceListResponse>(&resp_text) {
                     Ok(response) => response,
-                    Err(e) => return Err(Box::new(e)),
+                    Err(e) => {
+                        println!("Error parsing JSON: {}", e);
+                        return Err(Box::new(e));
+                    }
                 };
                 for device in response.data {
                     if device.adopted {

src/site/mod.rs

@@ -155,7 +155,7 @@ mod tests {
             name: "radio0".to_string(),
             nss: 2,
             tx_power_mode: "high".to_string(),
-            vwire_enabled: false,
+            vwire_enabled: Some(false),
             hard_noise_floor_enabled: Some(false),
             sens_level_enabled: Some(false),
             radio: "".to_string(),
@@ -216,7 +216,7 @@ mod tests {
             name: "".to_string(),
             nss: 0,
             tx_power_mode: "invalid".to_string(),
-            vwire_enabled: false,
+            vwire_enabled: Some(false),
             hard_noise_floor_enabled: None,
             sens_level_enabled: None,
             radio: "".to_string(),