Add support for legacy relays API
This commit is contained in:
@ -22,14 +22,15 @@ use openssl::ssl::{SslAcceptor, SslMethod};
|
||||
use std::time::Duration;
|
||||
|
||||
/// Start unsecure (HTTP) server
|
||||
pub async fn unsecure_server() -> anyhow::Result<()> {
|
||||
pub async fn unsecure_server(energy_actor: EnergyActorAddr) -> anyhow::Result<()> {
|
||||
log::info!(
|
||||
"Unsecure server starting to listen on {} for {}",
|
||||
AppConfig::get().unsecure_listen_address,
|
||||
AppConfig::get().unsecure_origin()
|
||||
);
|
||||
HttpServer::new(|| {
|
||||
HttpServer::new(move || {
|
||||
App::new()
|
||||
.app_data(web::Data::new(energy_actor.clone()))
|
||||
.wrap(Logger::default())
|
||||
.route(
|
||||
"/",
|
||||
@ -43,6 +44,10 @@ pub async fn unsecure_server() -> anyhow::Result<()> {
|
||||
"/pki/{file}",
|
||||
web::get().to(unsecure_pki_controller::serve_pki_file),
|
||||
)
|
||||
.route(
|
||||
"/relay/{id}/legacy_state",
|
||||
web::get().to(unsecure_relay_controller::legacy_state),
|
||||
)
|
||||
})
|
||||
.bind(&AppConfig::get().unsecure_listen_address)?
|
||||
.run()
|
||||
|
@ -1,2 +1,3 @@
|
||||
pub mod unsecure_pki_controller;
|
||||
pub mod unsecure_relay_controller;
|
||||
pub mod unsecure_server_controller;
|
||||
|
@ -0,0 +1,60 @@
|
||||
use crate::devices::device::DeviceRelayID;
|
||||
use crate::energy::{energy_actor, relay_state_history};
|
||||
use crate::server::custom_error::HttpResult;
|
||||
use crate::server::WebEnergyActor;
|
||||
use actix_web::{web, HttpResponse};
|
||||
|
||||
#[derive(serde::Deserialize)]
|
||||
pub struct LegacyStateRelay {
|
||||
id: DeviceRelayID,
|
||||
}
|
||||
|
||||
/// Legacy relay state
|
||||
#[derive(serde::Serialize)]
|
||||
pub struct LegacyState {
|
||||
/// Indicates if relay is on or off
|
||||
is_on: bool,
|
||||
/// Relay name
|
||||
name: String,
|
||||
/// Duration since last change of state
|
||||
r#for: usize,
|
||||
/// Current grid consumption
|
||||
prod: i32,
|
||||
/// Total uptime since last reset
|
||||
total_uptime: usize,
|
||||
/// Required uptime during a day
|
||||
///
|
||||
/// Will be 0 if there is no daily requirements
|
||||
required_uptime: usize,
|
||||
}
|
||||
|
||||
/// Get the state of a relay, adapted for old system components
|
||||
pub async fn legacy_state(
|
||||
energy_actor: WebEnergyActor,
|
||||
path: web::Path<LegacyStateRelay>,
|
||||
) -> HttpResult {
|
||||
let Some(relay) = energy_actor
|
||||
.send(energy_actor::GetSingleRelay(path.id))
|
||||
.await?
|
||||
else {
|
||||
return Ok(HttpResponse::NotFound().body("Relay not found!"));
|
||||
};
|
||||
|
||||
let all_states = energy_actor.send(energy_actor::GetAllRelaysState).await?;
|
||||
let Some(state) = all_states.into_iter().find(|r| r.id == path.id) else {
|
||||
return Ok(HttpResponse::InternalServerError().body("Relay status unavailable!"));
|
||||
};
|
||||
|
||||
let production = energy_actor.send(energy_actor::GetCurrConsumption).await?;
|
||||
|
||||
let total_uptime = relay_state_history::relay_total_runtime_adjusted(&relay);
|
||||
|
||||
Ok(HttpResponse::Ok().json(LegacyState {
|
||||
name: relay.name,
|
||||
is_on: state.on,
|
||||
r#for: state.r#for.min(3600 * 24 * 7),
|
||||
prod: production,
|
||||
total_uptime,
|
||||
required_uptime: relay.daily_runtime.map(|r| r.min_runtime).unwrap_or(0),
|
||||
}))
|
||||
}
|
@ -12,6 +12,7 @@ pub async fn secure_home() -> HttpResponse {
|
||||
struct ServerConfig {
|
||||
auth_disabled: bool,
|
||||
constraints: StaticConstraints,
|
||||
unsecure_origin: String,
|
||||
}
|
||||
|
||||
impl Default for ServerConfig {
|
||||
@ -19,6 +20,7 @@ impl Default for ServerConfig {
|
||||
Self {
|
||||
auth_disabled: AppConfig::get().unsecure_disable_login,
|
||||
constraints: Default::default(),
|
||||
unsecure_origin: AppConfig::get().unsecure_origin(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user