Don't block home widget if live consumption is unavailable

central_backend/src/energy/consumption.rs

@@ -71,7 +71,11 @@ pub async fn get_curr_consumption() -> anyhow::Result<EnergyConsumption> {
             let response = match curl {
                 false => reqwest::get(url).await?.json::<FroniusResponse>().await?,
                 true => {
-                    let res = std::process::Command::new("curl").arg(url).output()?;
+                    let res = std::process::Command::new("curl")
+                        .arg("--connect-timeout")
+                        .arg("1.5")
+                        .arg(url)
+                        .output()?;
 
                     if !res.status.success() {
                         return Err(ConsumptionError::CurlReqFailed.into());

central_backend/src/energy/energy_actor.rs

@@ -25,7 +25,14 @@ impl EnergyActor {
     pub async fn new() -> anyhow::Result<Self> {
         let consumption_cache_size =
             AppConfig::get().refresh_interval / AppConfig::get().energy_fetch_interval;
-        let curr_consumption = consumption::get_curr_consumption().await?;
+        let curr_consumption = match consumption::get_curr_consumption().await {
+            Ok(v) => v,
+            Err(e) => {
+                log::warn!("Failed to fetch consumption, using default value! {e}");
+                constants::FALLBACK_PRODUCTION_VALUE
+            }
+        };
+        log::info!("Initial consumption value: {curr_consumption}");
         let mut consumption_cache = ConsumptionCache::new(consumption_cache_size as usize);
         consumption_cache.add_value(curr_consumption);
 

central_backend/src/server/web_api/energy_controller.rs

@@ -9,14 +9,20 @@ use actix_web::HttpResponse;
 
 #[derive(serde::Serialize)]
 struct Consumption {
-    consumption: i32,
+    consumption: Option<i32>,
 }
 
 /// Get current energy consumption
 pub async fn curr_consumption() -> HttpResult {
-    let consumption = consumption::get_curr_consumption().await?;
-
-    Ok(HttpResponse::Ok().json(Consumption { consumption }))
+    Ok(match consumption::get_curr_consumption().await {
+        Ok(v) => HttpResponse::Ok().json(Consumption {
+            consumption: Some(v),
+        }),
+        Err(e) => {
+            log::error!("Failed to fetch current consumption! {e}");
+            HttpResponse::Ok().json(Consumption { consumption: None })
+        }
+    })
 }
 
 /// Get curr consumption history
@@ -34,7 +40,9 @@ pub async fn curr_consumption_history() -> HttpResult {
 pub async fn cached_consumption(energy_actor: WebEnergyActor) -> HttpResult {
     let consumption = energy_actor.send(energy_actor::GetCurrConsumption).await?;
 
-    Ok(HttpResponse::Ok().json(Consumption { consumption }))
+    Ok(HttpResponse::Ok().json(Consumption {
+        consumption: Some(consumption),
+    }))
 }
 
 /// Get current relays consumption
@@ -42,7 +50,9 @@ pub async fn relays_consumption(energy_actor: WebEnergyActor) -> HttpResult {
     let consumption =
         energy_actor.send(energy_actor::RelaysConsumption).await? as EnergyConsumption;
 
-    Ok(HttpResponse::Ok().json(Consumption { consumption }))
+    Ok(HttpResponse::Ok().json(Consumption {
+        consumption: Some(consumption),
+    }))
 }
 
 pub async fn relays_consumption_history() -> HttpResult {