robin/taspromto
1
0
Fork 0
mirror of https://codeberg.org/icewind/taspromto.git synced 2026-06-03 16:44:11 +02:00
Code Issues Projects Releases Wiki Activity

ask for name if not set after 5min

Browse source
This commit is contained in:
Robin Appelman 2021-02-07 20:24:05 +01:00
commit d93f1f91c1
1 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/main.rs
View file

@ -81,6 +81,18 @@ async fn mqtt_loop(
} }
} }
async fn command(client: &AsyncClient, device: &Device, command: &str) -> Result<()> {
client
.publish(
device.get_topic("cmnd", command),
QoS::AtMostOnce,
false,
"",
)
.await?;
Ok(())
}
async fn mqtt_client<S: Stream<Item = Result<Publish>>>( async fn mqtt_client<S: Stream<Item = Result<Publish>>>(
client: AsyncClient, client: AsyncClient,
stream: &mut Pin<&mut S>, stream: &mut Pin<&mut S>,
@ -100,26 +112,10 @@ async fn mqtt_client<S: Stream<Item = Result<Publish>>>(
// on discovery, ask the device for it's power state and name // on discovery, ask the device for it's power state and name
let send_client = client.clone(); let send_client = client.clone();
spawn(async move { spawn(async move {
if let Err(e) = send_client if let Err(e) = command(&send_client, &device, "POWER").await {
.publish(
device.get_topic("cmnd", "POWER"),
QoS::AtMostOnce,
false,
"",
)
.await
{
eprintln!("Failed to ask for power state: {:#}", e); eprintln!("Failed to ask for power state: {:#}", e);
} }
if let Err(e) = send_client if let Err(e) = command(&send_client, &device, "DeviceName").await {
.publish(
device.get_topic("cmnd", "DeviceName"),
QoS::AtMostOnce,
false,
"",
)
.await
{
eprintln!("Failed to ask for device name: {:#}", e); eprintln!("Failed to ask for device name: {:#}", e);
} }
}); });
@ -154,8 +150,11 @@ async fn cleanup(client: AsyncClient, devices: DeviceStates) {
if state.last_seen < cleanup_time { if state.last_seen < cleanup_time {
println!("{} hasn't been seen for 15m, removing", device.hostname); println!("{} hasn't been seen for 15m, removing", device.hostname);
true true
} else if state.last_seen < ping_time { } else if state.last_seen < ping_time || state.name.is_empty() {
println!("{} hasn't been seen for 10m, pinging", device.hostname); println!(
"{} hasn't been seen for 10m or has no name set, pinging",
device.hostname
);
let send_client = client.clone(); let send_client = client.clone();
let topic = device.get_topic("cmnd", "DeviceName"); let topic = device.get_topic("cmnd", "DeviceName");
spawn(async move { spawn(async move {
@ -169,6 +168,6 @@ async fn cleanup(client: AsyncClient, devices: DeviceStates) {
} }
}); });
sleep(Duration::from_secs(5 * 60)).await; sleep(Duration::from_secs(60)).await;
} }
} }