Compare commits
1 Commits
renovate/r
...
5fe87a1b3b
| Author | SHA1 | Date | |
|---|---|---|---|
| 5fe87a1b3b |
@@ -5,7 +5,7 @@ name: default
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: web_build
|
- name: web_build
|
||||||
image: node:25
|
image: node:23
|
||||||
volumes:
|
volumes:
|
||||||
- name: web_app
|
- name: web_app
|
||||||
path: /tmp/web_build
|
path: /tmp/web_build
|
||||||
@@ -63,7 +63,7 @@ steps:
|
|||||||
|
|
||||||
# Build ESP32 program
|
# Build ESP32 program
|
||||||
- name: esp32_compile
|
- name: esp32_compile
|
||||||
image: espressif/idf:v5.5.2
|
image: espressif/idf:v5.5.1
|
||||||
volumes:
|
volumes:
|
||||||
- name: releases
|
- name: releases
|
||||||
path: /tmp/releases
|
path: /tmp/releases
|
||||||
|
|||||||
1483
central_backend/Cargo.lock
generated
1483
central_backend/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -4,24 +4,24 @@ version = "1.0.3"
|
|||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
log = "0.4.29"
|
log = "0.4.28"
|
||||||
env_logger = "0.11.8"
|
env_logger = "0.11.8"
|
||||||
lazy_static = "1.5.0"
|
lazy_static = "1.5.0"
|
||||||
dotenvy = "0.15.7"
|
dotenvy = "0.15.7"
|
||||||
clap = { version = "4.5.54", features = ["derive", "env"] }
|
clap = { version = "4.5.53", features = ["derive", "env"] }
|
||||||
anyhow = "1.0.100"
|
anyhow = "1.0.100"
|
||||||
thiserror = "2.0.18"
|
thiserror = "2.0.17"
|
||||||
openssl = { version = "0.10.75" }
|
openssl = { version = "0.10.75" }
|
||||||
openssl-sys = "0.9.111"
|
openssl-sys = "0.9.111"
|
||||||
libc = "0.2.180"
|
libc = "0.2.177"
|
||||||
foreign-types-shared = "0.1.1"
|
foreign-types-shared = "0.1.1"
|
||||||
asn1 = "0.23.0"
|
asn1 = "0.23.0"
|
||||||
actix-web = { version = "4.12.1", features = ["openssl"] }
|
actix-web = { version = "4.12.1", features = ["openssl"] }
|
||||||
futures = "0.3.31"
|
futures = "0.3.31"
|
||||||
serde = { version = "1.0.228", features = ["derive"] }
|
serde = { version = "1.0.228", features = ["derive"] }
|
||||||
reqwest = { version = "0.13.1", features = ["json"] }
|
reqwest = { version = "0.12.24", features = ["json"] }
|
||||||
serde_json = "1.0.149"
|
serde_json = "1.0.145"
|
||||||
rand = "0.10.0-rc.6"
|
rand = "0.10.0-rc.5"
|
||||||
actix = "0.13.5"
|
actix = "0.13.5"
|
||||||
actix-identity = "0.9.0"
|
actix-identity = "0.9.0"
|
||||||
actix-session = { version = "0.11.0", features = ["cookie-session"] }
|
actix-session = { version = "0.11.0", features = ["cookie-session"] }
|
||||||
@@ -29,18 +29,18 @@ actix-cors = "0.7.1"
|
|||||||
actix-multipart = { version = "0.7.2", features = ["derive"] }
|
actix-multipart = { version = "0.7.2", features = ["derive"] }
|
||||||
actix-remote-ip = "0.1.0"
|
actix-remote-ip = "0.1.0"
|
||||||
futures-util = "0.3.31"
|
futures-util = "0.3.31"
|
||||||
uuid = { version = "1.19.0", features = ["v4", "serde"] }
|
uuid = { version = "1.18.1", features = ["v4", "serde"] }
|
||||||
semver = { version = "1.0.27", features = ["serde"] }
|
semver = { version = "1.0.27", features = ["serde"] }
|
||||||
lazy-regex = "3.4.2"
|
lazy-regex = "3.4.2"
|
||||||
tokio = { version = "1.48.0", features = ["full"] }
|
tokio = { version = "1.48.0", features = ["full"] }
|
||||||
tokio_schedule = "0.3.2"
|
tokio_schedule = "0.3.2"
|
||||||
mime_guess = "2.0.5"
|
mime_guess = "2.0.5"
|
||||||
rust-embed = "8.9.0"
|
rust-embed = "8.8.0"
|
||||||
jsonwebtoken = { version = "10.2.0", features = ["use_pem", "rust_crypto"] }
|
jsonwebtoken = { version = "10.1.0", features = ["use_pem", "rust_crypto"] }
|
||||||
prettytable-rs = "0.10.0"
|
prettytable-rs = "0.10.0"
|
||||||
chrono = "0.4.43"
|
chrono = "0.4.42"
|
||||||
serde_yml = "0.0.12"
|
serde_yml = "0.0.12"
|
||||||
bincode-next = "2.0.4"
|
bincode = "2.0.1"
|
||||||
fs4 = { version = "0.13.1", features = ["sync"] }
|
fs4 = { version = "0.13.1", features = ["sync"] }
|
||||||
zip = { version = "6.0.0", features = ["bzip2"] }
|
zip = { version = "6.0.0", features = ["bzip2"] }
|
||||||
walkdir = "2.5.0"
|
walkdir = "2.5.0"
|
||||||
|
|||||||
@@ -29,9 +29,9 @@ impl ConsumptionHistoryFile {
|
|||||||
if path.exists() {
|
if path.exists() {
|
||||||
Ok(Self {
|
Ok(Self {
|
||||||
day,
|
day,
|
||||||
buff: bincode_next::decode_from_slice(
|
buff: bincode::decode_from_slice(
|
||||||
&std::fs::read(path)?,
|
&std::fs::read(path)?,
|
||||||
bincode_next::config::standard(),
|
bincode::config::standard(),
|
||||||
)?
|
)?
|
||||||
.0,
|
.0,
|
||||||
r#type,
|
r#type,
|
||||||
@@ -94,7 +94,7 @@ impl ConsumptionHistoryFile {
|
|||||||
let path = AppConfig::get().energy_consumption_history_day(self.day, self.r#type);
|
let path = AppConfig::get().energy_consumption_history_day(self.day, self.r#type);
|
||||||
std::fs::write(
|
std::fs::write(
|
||||||
path,
|
path,
|
||||||
bincode_next::encode_to_vec(&self.buff, bincode_next::config::standard())?,
|
bincode::encode_to_vec(&self.buff, bincode::config::standard())?,
|
||||||
)?;
|
)?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -389,7 +389,7 @@ impl Handler<SynchronizeDevice> for EnergyActor {
|
|||||||
pub struct ResDevState {
|
pub struct ResDevState {
|
||||||
pub id: DeviceId,
|
pub id: DeviceId,
|
||||||
last_ping: u64,
|
last_ping: u64,
|
||||||
pub online: bool,
|
online: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Get the state of devices
|
/// Get the state of devices
|
||||||
|
|||||||
@@ -48,10 +48,6 @@ pub async fn unsecure_server(energy_actor: EnergyActorAddr) -> anyhow::Result<()
|
|||||||
"/relay/{id}/legacy_state",
|
"/relay/{id}/legacy_state",
|
||||||
web::get().to(unsecure_relay_controller::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)?
|
.bind(&AppConfig::get().unsecure_listen_address)?
|
||||||
.run()
|
.run()
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
use crate::devices::device::DeviceRelayID;
|
use crate::devices::device::DeviceRelayID;
|
||||||
use crate::energy::engine::RelayForcedState;
|
use crate::energy::{energy_actor, relay_state_history};
|
||||||
use crate::energy::{consumption, energy_actor, relay_state_history};
|
|
||||||
use crate::server::WebEnergyActor;
|
use crate::server::WebEnergyActor;
|
||||||
use crate::server::custom_error::HttpResult;
|
use crate::server::custom_error::HttpResult;
|
||||||
use actix_web::{HttpResponse, web};
|
use actix_web::{HttpResponse, web};
|
||||||
@@ -59,80 +58,3 @@ pub async fn legacy_state(
|
|||||||
required_uptime: relay.daily_runtime.map(|r| r.min_runtime).unwrap_or(0),
|
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,
|
|
||||||
/// Indicate if the device is online or not
|
|
||||||
online: 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
|
|
||||||
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 devices = energy_actor.send(energy_actor::GetDeviceLists).await?;
|
|
||||||
let devices_state = energy_actor.send(energy_actor::GetDevicesState).await?;
|
|
||||||
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 device = devices
|
|
||||||
.iter()
|
|
||||||
.find(|d| d.relays.iter().any(|sr| sr.id == r.id))
|
|
||||||
.expect("All relay shall have an associated device!");
|
|
||||||
let device_state = devices_state.iter().find(|s| s.id == device.id);
|
|
||||||
let relay_state = relays_state.iter().find(|s| s.id == r.id);
|
|
||||||
let total_uptime = relay_state_history::relay_total_runtime_adjusted(&r);
|
|
||||||
|
|
||||||
FullRelayState {
|
|
||||||
enabled: r.enabled && device.enabled,
|
|
||||||
online: device_state.map(|d| d.online).unwrap_or(false),
|
|
||||||
is_on: relay_state.map(|s| s.on).unwrap_or(false),
|
|
||||||
name: r.name,
|
|
||||||
priority: r.priority,
|
|
||||||
r#for: relay_state.map(|s| s.r#for).unwrap_or(0),
|
|
||||||
total_uptime,
|
|
||||||
daily_requirement: r.daily_runtime.map(|r| r.min_runtime),
|
|
||||||
forced_state: relay_state
|
|
||||||
.map(|s| s.forced_state.clone())
|
|
||||||
.unwrap_or_default(),
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.collect(),
|
|
||||||
}))
|
|
||||||
}
|
|
||||||
|
|||||||
1143
central_frontend/package-lock.json
generated
1143
central_frontend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -15,31 +15,31 @@
|
|||||||
"@fontsource/roboto": "^5.2.9",
|
"@fontsource/roboto": "^5.2.9",
|
||||||
"@mdi/js": "^7.4.47",
|
"@mdi/js": "^7.4.47",
|
||||||
"@mdi/react": "^1.6.1",
|
"@mdi/react": "^1.6.1",
|
||||||
"@mui/icons-material": "^7.3.7",
|
"@mui/icons-material": "^7.3.5",
|
||||||
"@mui/material": "^7.3.7",
|
"@mui/material": "^7.3.5",
|
||||||
"@mui/x-charts": "^8.25.0",
|
"@mui/x-charts": "^8.20.0",
|
||||||
"@mui/x-date-pickers": "^8.25.0",
|
"@mui/x-date-pickers": "^8.19.0",
|
||||||
"date-and-time": "^4.1.2",
|
"date-and-time": "^4.1.1",
|
||||||
"dayjs": "^1.11.19",
|
"dayjs": "^1.11.19",
|
||||||
"filesize": "^11.0.13",
|
"filesize": "^11.0.13",
|
||||||
"react": "^19.2.3",
|
"react": "^19.2.0",
|
||||||
"react-dom": "^19.2.3",
|
"react-dom": "^19.2.0",
|
||||||
"react-router-dom": "^7.11.0",
|
"react-router-dom": "^7.9.6",
|
||||||
"semver": "^7.7.3"
|
"semver": "^7.7.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/react": "^19.2.9",
|
"@types/react": "^19.2.7",
|
||||||
"@types/react-dom": "^19.2.3",
|
"@types/react-dom": "^19.2.3",
|
||||||
"@types/semver": "^7.7.1",
|
"@types/semver": "^7.7.1",
|
||||||
"@typescript-eslint/eslint-plugin": "^8.53.1",
|
"@typescript-eslint/eslint-plugin": "^8.48.1",
|
||||||
"@typescript-eslint/parser": "^8.53.1",
|
"@typescript-eslint/parser": "^8.48.0",
|
||||||
"@vitejs/plugin-react": "^5.1.2",
|
"@vitejs/plugin-react": "^5.1.1",
|
||||||
"eslint": "^9.39.2",
|
"eslint": "^9.39.1",
|
||||||
"eslint-plugin-react-hooks": "^7.0.1",
|
"eslint-plugin-react-hooks": "^7.0.1",
|
||||||
"eslint-plugin-react-refresh": "^0.4.26",
|
"eslint-plugin-react-refresh": "^0.4.24",
|
||||||
"globals": "^16.5.0",
|
"globals": "^16.5.0",
|
||||||
"typescript": "^5.9.3",
|
"typescript": "^5.9.3",
|
||||||
"typescript-eslint": "^8.53.1",
|
"typescript-eslint": "^8.48.1",
|
||||||
"vite": "^7.3.1"
|
"vite": "^7.2.6"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
1640
custom_consumption/Cargo.lock
generated
1640
custom_consumption/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -5,8 +5,8 @@ edition = "2024"
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
env_logger = "0.11.8"
|
env_logger = "0.11.8"
|
||||||
log = "0.4.29"
|
log = "0.4.28"
|
||||||
clap = { version = "4.5.54", features = ["derive", "env"] }
|
clap = { version = "4.5.53", features = ["derive", "env"] }
|
||||||
egui = "0.33.3"
|
egui = "0.33.2"
|
||||||
eframe = "0.33.3"
|
eframe = "0.32.3"
|
||||||
lazy_static = "1.5.0"
|
lazy_static = "1.5.0"
|
||||||
|
|||||||
Reference in New Issue
Block a user