emgauwa/core
2
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Improve active handling for controllers

Browse source
This commit is contained in:
Tobias Reisinger 2023-11-28 00:19:15 +01:00
parent ec461a1a14
commit 6459804e1f
Signed by: serguzim
GPG key ID: 13AD60C237A28DFE
7 changed files with 87 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

36
emgauwa-lib/src/db/controllers.rs
View file

@ -58,11 +58,10 @@ impl DbController {
uid: &ControllerUid,
new_name: &str,
new_relay_count: i64,
new_active: bool,
) -> Result<DbController, DatabaseError> {
match DbController::get_by_uid(conn, uid).await? {
Some(tag) => Ok(tag),
None => DbController::create(conn, uid, new_name, new_relay_count, new_active).await,
None => DbController::create(conn, uid, new_name, new_relay_count).await,
}
}
@ -94,15 +93,13 @@ impl DbController {
new_uid: &ControllerUid,
new_name: &str,
new_relay_count: i64,
new_active: bool,
) -> Result<DbController, DatabaseError> {
sqlx::query_as!(
DbController,
"INSERT INTO controllers (uid, name, relay_count, active) VALUES (?, ?, ?, ?) RETURNING *",
"INSERT INTO controllers (uid, name, relay_count) VALUES (?, ?, ?) RETURNING *",
new_uid,
new_name,
new_relay_count,
new_active,
)
.fetch_optional(conn.deref_mut())
.await?
@ -114,12 +111,28 @@ impl DbController {
conn: &mut PoolConnection<Sqlite>,
new_name: &str,
new_relay_count: i64,
) -> Result<DbController, DatabaseError> {
sqlx::query!(
"UPDATE controllers SET name = ?, relay_count = ? WHERE id = ?",
new_name,
new_relay_count,
self.id,
)
.execute(conn.deref_mut())
.await?;
Self::get(conn, self.id)
.await?
.ok_or(DatabaseError::UpdateGetError)
}
pub async fn update_active(
&self,
conn: &mut PoolConnection<Sqlite>,
new_active: bool,
) -> Result<DbController, DatabaseError> {
sqlx::query!(
"UPDATE controllers SET name = ?, relay_count = ?, active = ? WHERE id = ?",
new_name,
new_relay_count,
"UPDATE controllers SET active = ? WHERE id = ?",
new_active,
self.id,
)
@ -130,4 +143,11 @@ impl DbController {
.await?
.ok_or(DatabaseError::UpdateGetError)
}
pub async fn all_inactive(conn: &mut PoolConnection<Sqlite>) -> Result<(), DatabaseError> {
sqlx::query!("UPDATE controllers SET active = 0")
.execute(conn.deref_mut())
.await?;
Ok(())
}
}

64
emgauwa-lib/src/handlers/v1/ws/controllers.rs
View file

@ -18,10 +18,18 @@ pub enum ControllerWsAction {
struct ControllerWs {
pub pool: Pool<Sqlite>,
pub controller: Option<DbController>,
}
impl Actor for ControllerWs {
type Context = ws::WebsocketContext<Self>;
fn stopped(&mut self, _ctx: &mut Self::Context) {
if let Some(controller) = &self.controller {
let mut pool_conn = futures::executor::block_on(self.pool.acquire()).unwrap();
futures::executor::block_on(controller.update_active(&mut pool_conn, false)).unwrap();
}
}
}
impl StreamHandler<Result<Message, ProtocolError>> for ControllerWs {
@ -32,7 +40,8 @@ impl StreamHandler<Result<Message, ProtocolError>> for ControllerWs {
Ok(Message::Ping(msg)) => ctx.pong(&msg),
Ok(Message::Text(text)) => {
let action: ControllerWsAction = serde_json::from_str(&text).unwrap();
let action_res = futures::executor::block_on(handle_action(&mut pool_conn, action));
let action_res =
futures::executor::block_on(self.handle_action(&mut pool_conn, action));
if let Err(e) = action_res {
log::error!("Error handling action: {:?}", e);
ctx.text(serde_json::to_string(&e).unwrap());
@ -47,33 +56,39 @@ impl StreamHandler<Result<Message, ProtocolError>> for ControllerWs {
}
}
pub async fn handle_action(
conn: &mut PoolConnection<Sqlite>,
action: ControllerWsAction,
) -> Result<(), DatabaseError> {
match action {
ControllerWsAction::Register(controller) => {
log::info!("Registering controller: {:?}", controller);
let c = &controller.controller;
let controller_db =
DbController::get_by_uid_or_create(conn, &c.uid, &c.name, c.relay_count, c.active)
impl ControllerWs {
pub async fn handle_action(
&mut self,
conn: &mut PoolConnection<Sqlite>,
action: ControllerWsAction,
) -> Result<(), DatabaseError> {
match action {
ControllerWsAction::Register(controller) => {
log::info!("Registering controller: {:?}", controller);
let c = &controller.controller;
let controller_db =
DbController::get_by_uid_or_create(conn, &c.uid, &c.name, c.relay_count)
.await?;
controller_db.update_active(conn, true).await?;
println!("Controller: {:?}", controller_db);
for relay in &controller.relays {
let r = &relay.relay;
let relay_db = DbRelay::get_by_controller_and_num_or_create(
conn,
&controller_db,
r.number,
&r.name,
)
.await?;
println!("Controller relay: {:?}", relay_db);
}
println!("Controller: {:?}", controller_db);
self.controller = Some(controller_db);
for relay in &controller.relays {
let r = &relay.relay;
let relay_db = DbRelay::get_by_controller_and_num_or_create(
conn,
&controller_db,
r.number,
&r.name,
)
.await?;
println!("Controller relay: {:?}", relay_db);
Ok(())
}
Ok(())
}
}
}
@ -87,6 +102,7 @@ pub async fn index(
let resp = ws::start(
ControllerWs {
pool: pool.get_ref().clone(),
controller: None,
},
&req,
stream,