Update custom consumption dependencies

central_backend/Cargo.toml

@@ -4,24 +4,24 @@ version = "1.0.3"
 edition = "2024"
 
 [dependencies]
-log = "0.4.28"
+log = "0.4.29"
 env_logger = "0.11.8"
 lazy_static = "1.5.0"
 dotenvy = "0.15.7"
-clap = { version = "4.5.50", features = ["derive", "env"] }
+clap = { version = "4.5.53", features = ["derive", "env"] }
 anyhow = "1.0.100"
 thiserror = "2.0.17"
-openssl = { version = "0.10.74" }
+openssl = { version = "0.10.75" }
-openssl-sys = "0.9.110"
+openssl-sys = "0.9.111"
-libc = "0.2.177"
+libc = "0.2.178"
 foreign-types-shared = "0.1.1"
 asn1 = "0.23.0"
-actix-web = { version = "4.11.0", features = ["openssl"] }
+actix-web = { version = "4.12.1", features = ["openssl"] }
 futures = "0.3.31"
 serde = { version = "1.0.228", features = ["derive"] }
 reqwest = { version = "0.12.24", features = ["json"] }
 serde_json = "1.0.145"
-rand = "0.10.0-rc.0"
+rand = "0.10.0-rc.5"
 actix = "0.13.5"
 actix-identity = "0.9.0"
 actix-session = { version = "0.11.0", features = ["cookie-session"] }
@@ -29,14 +29,14 @@ actix-cors = "0.7.1"
 actix-multipart = { version = "0.7.2", features = ["derive"] }
 actix-remote-ip = "0.1.0"
 futures-util = "0.3.31"
-uuid = { version = "1.18.1", features = ["v4", "serde"] }
+uuid = { version = "1.19.0", features = ["v4", "serde"] }
 semver = { version = "1.0.27", features = ["serde"] }
-lazy-regex = "3.4.1"
+lazy-regex = "3.4.2"
 tokio = { version = "1.48.0", features = ["full"] }
 tokio_schedule = "0.3.2"
 mime_guess = "2.0.5"
-rust-embed = "8.8.0"
+rust-embed = "8.9.0"
-jsonwebtoken = { version = "10.1.0", features = ["use_pem", "rust_crypto"] }
+jsonwebtoken = { version = "10.2.0", features = ["use_pem", "rust_crypto"] }
 prettytable-rs = "0.10.0"
 chrono = "0.4.42"
 serde_yml = "0.0.12"

central_backend/src/server/servers.rs

@@ -48,6 +48,10 @@ pub async fn unsecure_server(energy_actor: EnergyActorAddr) -> anyhow::Result<()
                 "/relay/{id}/legacy_state",
                 web::get().to(unsecure_relay_controller::legacy_state),
             )
+            .route(
+                "/relay/relays_full_state",
+                web::get().to(unsecure_relay_controller::relays_full_state),
+            )
     })
     .bind(&AppConfig::get().unsecure_listen_address)?
     .run()

central_backend/src/server/unsecure_server/unsecure_relay_controller.rs

@@ -1,5 +1,6 @@
 use crate::devices::device::DeviceRelayID;
-use crate::energy::{energy_actor, relay_state_history};
+use crate::energy::engine::RelayForcedState;
+use crate::energy::{consumption, energy_actor, relay_state_history};
 use crate::server::WebEnergyActor;
 use crate::server::custom_error::HttpResult;
 use actix_web::{HttpResponse, web};
@@ -58,3 +59,66 @@ pub async fn legacy_state(
         required_uptime: relay.daily_runtime.map(|r| r.min_runtime).unwrap_or(0),
     }))
 }
+
+#[derive(serde::Serialize)]
+pub struct FullRelayState {
+    /// Indicates if the relay (or its parent device) is enabled or not
+    enabled: bool,
+    /// Indicates if relay is on or off
+    is_on: bool,
+    /// Relay name
+    name: String,
+    /// Relay priority (0 = lowest)
+    priority: usize,
+    /// Duration since last change of state
+    r#for: usize,
+    /// Total uptime since last reset
+    total_uptime: usize,
+    /// Required uptime during a day (in seconds)
+    daily_requirement: Option<usize>,
+    /// Forced relay state
+    relay_forced_state: RelayForcedState,
+}
+
+#[derive(serde::Serialize)]
+pub struct RelaysFullState {
+    /// Current global consumption, if successful
+    curr_consumption: Option<i32>,
+    /// Cached consumption
+    cached_consumption: i32,
+    /// Total relays consumptions
+    relays_consumption: usize,
+    /// Individual relays state
+    relays: Vec<FullRelayState>,
+}
+
+pub async fn relays_full_state(energy_actor: WebEnergyActor) -> HttpResult {
+    let cached_consumption = energy_actor.send(energy_actor::GetCurrConsumption).await?;
+    let relays_consumption = energy_actor.send(energy_actor::RelaysConsumption).await?;
+    let curr_consumption = consumption::get_curr_consumption().await.ok();
+    let mut relays = energy_actor.send(energy_actor::GetRelaysList).await?;
+    relays.sort_by_key(|r| -(r.priority as i64));
+    let relays_state = energy_actor.send(energy_actor::GetAllRelaysState).await?;
+
+    Ok(HttpResponse::Ok().json(RelaysFullState {
+        curr_consumption,
+        cached_consumption,
+        relays_consumption,
+        relays: relays
+            .into_iter()
+            .map(|r| {
+                let state = relays_state.iter().find(|s| s.id == r.id);
+                FullRelayState {
+                    enabled: r.enabled,
+                    is_on: state.map(|s| s.on).unwrap_or(false),
+                    name: r.name,
+                    priority: r.priority,
+                    r#for: state.map(|s| s.r#for).unwrap_or(0),
+                    total_uptime: 0,
+                    daily_requirement: r.daily_runtime.map(|r| r.min_runtime),
+                    relay_forced_state: state.map(|s| s.forced_state.clone()).unwrap_or_default(),
+                }
+            })
+            .collect(),
+    }))
+}

central_frontend/package.json

@@ -12,34 +12,34 @@
   "dependencies": {
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.1",
-    "@fontsource/roboto": "^5.2.8",
+    "@fontsource/roboto": "^5.2.9",
     "@mdi/js": "^7.4.47",
     "@mdi/react": "^1.6.1",
-    "@mui/icons-material": "^7.3.4",
+    "@mui/icons-material": "^7.3.6",
-    "@mui/material": "^7.3.4",
+    "@mui/material": "^7.3.6",
-    "@mui/x-charts": "^8.15.0",
+    "@mui/x-charts": "^8.21.0",
-    "@mui/x-date-pickers": "^8.15.0",
+    "@mui/x-date-pickers": "^8.21.0",
-    "date-and-time": "^4.1.0",
+    "date-and-time": "^4.1.1",
-    "dayjs": "^1.11.18",
+    "dayjs": "^1.11.19",
     "filesize": "^11.0.13",
-    "react": "^19.2.0",
+    "react": "^19.2.1",
-    "react-dom": "^19.2.0",
+    "react-dom": "^19.2.1",
-    "react-router-dom": "^7.9.4",
+    "react-router-dom": "^7.10.1",
     "semver": "^7.7.3"
   },
   "devDependencies": {
-    "@types/react": "^19.2.2",
+    "@types/react": "^19.2.7",
-    "@types/react-dom": "^19.2.2",
+    "@types/react-dom": "^19.2.3",
     "@types/semver": "^7.7.1",
-    "@typescript-eslint/eslint-plugin": "^8.46.2",
+    "@typescript-eslint/eslint-plugin": "^8.48.1",
-    "@typescript-eslint/parser": "^8.46.2",
+    "@typescript-eslint/parser": "^8.48.1",
-    "@vitejs/plugin-react": "^5.1.0",
+    "@vitejs/plugin-react": "^5.1.2",
-    "eslint": "^9.38.0",
+    "eslint": "^9.39.1",
     "eslint-plugin-react-hooks": "^7.0.1",
     "eslint-plugin-react-refresh": "^0.4.24",
-    "globals": "^16.4.0",
+    "globals": "^16.5.0",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.46.2",
+    "typescript-eslint": "^8.48.1",
-    "vite": "^7.1.12"
+    "vite": "^7.2.7"
   }
 }

custom_consumption/Cargo.toml

@@ -5,8 +5,8 @@ edition = "2024"
 
 [dependencies]
 env_logger = "0.11.8"
-log = "0.4.28"
+log = "0.4.29"
-clap = { version = "4.5.50", features = ["derive", "env"] }
+clap = { version = "4.5.53", features = ["derive", "env"] }
-egui = "0.32.3"
+egui = "0.33.2"
-eframe = "0.32.3"
+eframe = "0.33.2"
 lazy_static = "1.5.0"