Rework MQTT to allow async message handelling
This commit is contained in:
2 files changed
+202
-176
No files matched your search
+201
-176
@@ -118,190 +118,215 @@ async fn listen_on_camera(cam_config: Arc<CameraConfig>, mqtt_config: &MqttConfi
|
||||
|
||||
// Listen on mqtt messages and post on camera
|
||||
let camera_name = cam_config.name.clone();
|
||||
// When one error is recieved we pass it up async
|
||||
let (error_send, mut error_recv) = tokio::sync::mpsc::channel::<Error>(1);
|
||||
|
||||
let mqtt_to_cam = async {
|
||||
while let Ok(msg) = mqtt.poll().await {
|
||||
tokio::task::yield_now().await;
|
||||
let mut reply = None;
|
||||
let mut reply_topic = None;
|
||||
match msg.as_ref() {
|
||||
MqttReplyRef {
|
||||
topic: "control/led",
|
||||
message: "on",
|
||||
} => {
|
||||
reply = Some(
|
||||
event_cam_sender
|
||||
.send_message_with_reply(Messages::StatusLedOn)
|
||||
.await
|
||||
.with_context(|| "Failed to set camera status light on")?,
|
||||
);
|
||||
}
|
||||
MqttReplyRef {
|
||||
topic: "control/led",
|
||||
message: "off",
|
||||
} => {
|
||||
reply = Some(
|
||||
event_cam_sender
|
||||
.send_message_with_reply(Messages::StatusLedOff)
|
||||
.await
|
||||
.with_context(|| "Failed to set camera status light off")?,
|
||||
);
|
||||
}
|
||||
MqttReplyRef {
|
||||
topic: "control/ir",
|
||||
message: "on",
|
||||
} => {
|
||||
reply = Some(
|
||||
event_cam_sender
|
||||
.send_message_with_reply(Messages::IRLedOn)
|
||||
.await
|
||||
.with_context(|| "Failed to set camera status light on")?,
|
||||
);
|
||||
}
|
||||
MqttReplyRef {
|
||||
topic: "control/ir",
|
||||
message: "off",
|
||||
} => {
|
||||
reply = Some(
|
||||
event_cam_sender
|
||||
.send_message_with_reply(Messages::IRLedOff)
|
||||
.await
|
||||
.with_context(|| "Failed to set camera status light off")?,
|
||||
);
|
||||
}
|
||||
MqttReplyRef {
|
||||
topic: "control/ir",
|
||||
message: "auto",
|
||||
} => {
|
||||
reply = Some(
|
||||
event_cam_sender
|
||||
.send_message_with_reply(Messages::IRLedAuto)
|
||||
.await
|
||||
.with_context(|| "Failed to set camera status light off")?,
|
||||
);
|
||||
}
|
||||
MqttReplyRef {
|
||||
topic: "control/reboot",
|
||||
..
|
||||
} => {
|
||||
reply = Some(
|
||||
event_cam_sender
|
||||
.send_message_with_reply(Messages::Reboot)
|
||||
.await
|
||||
.with_context(|| "Failed to set camera status light off")?,
|
||||
);
|
||||
}
|
||||
MqttReplyRef {
|
||||
topic: "control/ptz",
|
||||
message,
|
||||
} => {
|
||||
let lowercase_message = message.to_lowercase();
|
||||
let mut words = lowercase_message.split_whitespace();
|
||||
if let Some(direction_txt) = words.next() {
|
||||
let amount = words.next().unwrap_or("32.0");
|
||||
let seconds = words.next().unwrap_or("1.0");
|
||||
if let Ok(amount) = amount.parse::<f32>() {
|
||||
if let Ok(seconds) = seconds.parse::<f32>() {
|
||||
// Select to wait on an error (via the channel) or normal poll ops
|
||||
tokio::select! {
|
||||
v = async {
|
||||
// Normal poll operations
|
||||
while let Ok(msg) = mqtt.poll().await {
|
||||
tokio::task::yield_now().await;
|
||||
// Put the reply on it's own async thread so we can safely sleep
|
||||
// and wait for it to reply in it's own time
|
||||
let event_cam_sender = event_cam_sender.clone();
|
||||
let mqtt_sender_mqtt = mqtt_sender_mqtt.clone();
|
||||
let error_send = error_send.clone();
|
||||
tokio::task::spawn(async move {
|
||||
// This is to let us grap the result of all the following (specifically its error)
|
||||
let result: Result<()> = async {
|
||||
let mut reply = None;
|
||||
let mut reply_topic = None;
|
||||
match msg.as_ref() {
|
||||
MqttReplyRef {
|
||||
topic: "control/led",
|
||||
message: "on",
|
||||
} => {
|
||||
reply = Some(
|
||||
event_cam_sender
|
||||
.send_message_with_reply(Messages::StatusLedOn)
|
||||
.await
|
||||
.with_context(|| "Failed to set camera status light on")?,
|
||||
);
|
||||
}
|
||||
MqttReplyRef {
|
||||
topic: "control/led",
|
||||
message: "off",
|
||||
} => {
|
||||
reply = Some(
|
||||
event_cam_sender
|
||||
.send_message_with_reply(Messages::StatusLedOff)
|
||||
.await
|
||||
.with_context(|| "Failed to set camera status light off")?,
|
||||
);
|
||||
}
|
||||
MqttReplyRef {
|
||||
topic: "control/ir",
|
||||
message: "on",
|
||||
} => {
|
||||
reply = Some(
|
||||
event_cam_sender
|
||||
.send_message_with_reply(Messages::IRLedOn)
|
||||
.await
|
||||
.with_context(|| "Failed to set camera status light on")?,
|
||||
);
|
||||
}
|
||||
MqttReplyRef {
|
||||
topic: "control/ir",
|
||||
message: "off",
|
||||
} => {
|
||||
reply = Some(
|
||||
event_cam_sender
|
||||
.send_message_with_reply(Messages::IRLedOff)
|
||||
.await
|
||||
.with_context(|| "Failed to set camera status light off")?,
|
||||
);
|
||||
}
|
||||
MqttReplyRef {
|
||||
topic: "control/ir",
|
||||
message: "auto",
|
||||
} => {
|
||||
reply = Some(
|
||||
event_cam_sender
|
||||
.send_message_with_reply(Messages::IRLedAuto)
|
||||
.await
|
||||
.with_context(|| "Failed to set camera status light off")?,
|
||||
);
|
||||
}
|
||||
MqttReplyRef {
|
||||
topic: "control/reboot",
|
||||
..
|
||||
} => {
|
||||
reply = Some(
|
||||
event_cam_sender
|
||||
.send_message_with_reply(Messages::Reboot)
|
||||
.await
|
||||
.with_context(|| "Failed to set camera status light off")?,
|
||||
);
|
||||
}
|
||||
MqttReplyRef {
|
||||
topic: "control/ptz",
|
||||
message,
|
||||
} => {
|
||||
let lowercase_message = message.to_lowercase();
|
||||
let mut words = lowercase_message.split_whitespace();
|
||||
if let Some(direction_txt) = words.next() {
|
||||
// Target amount to move
|
||||
let amount = words.next().unwrap_or("32.0");
|
||||
if let Ok(amount) = amount.parse::<f32>() {
|
||||
let seconds = amount / 32f32;
|
||||
// range checking on seconds so that you can't sleep for 3.4E+38 seconds
|
||||
match seconds {
|
||||
x if (0.0..10.0).contains(&x) => seconds,
|
||||
_ => {
|
||||
error!("seconds was not a valid number (out of range)");
|
||||
return Result::<(), Error>::Ok(());
|
||||
}
|
||||
};
|
||||
|
||||
// range checking on seconds so that you can't sleep for 3.4E+38 seconds
|
||||
match seconds {
|
||||
x if (0.0..10.0).contains(&x) => seconds,
|
||||
_ => {
|
||||
error!("seconds was not a valid number (out of range)");
|
||||
continue;
|
||||
let direction = match direction_txt {
|
||||
"up" => Direction::Up(amount, seconds),
|
||||
"down" => Direction::Down(amount, seconds),
|
||||
"left" => Direction::Left(amount, seconds),
|
||||
"right" => Direction::Right(amount, seconds),
|
||||
"in" => Direction::In(amount, seconds),
|
||||
"out" => Direction::Out(amount, seconds),
|
||||
"ok" | "fail" => {
|
||||
return Ok(());
|
||||
}
|
||||
_ => {
|
||||
error!("Unrecognized PTZ direction \"{}\"", direction_txt);
|
||||
return Ok(());
|
||||
}
|
||||
};
|
||||
reply = Some(
|
||||
event_cam_sender
|
||||
.send_message_with_reply(Messages::Ptz(direction))
|
||||
.await
|
||||
.with_context(|| "Failed to send PTZ")?,
|
||||
);
|
||||
} else {
|
||||
error!("No PTZ direction speed was not a valid number");
|
||||
}
|
||||
} else {
|
||||
error!("No PTZ Direction given. Please add up/down/left/right/in/out");
|
||||
}
|
||||
};
|
||||
|
||||
let direction = match direction_txt {
|
||||
"up" => Direction::Up(amount, seconds),
|
||||
"down" => Direction::Down(amount, seconds),
|
||||
"left" => Direction::Left(amount, seconds),
|
||||
"right" => Direction::Right(amount, seconds),
|
||||
"in" => Direction::In(amount, seconds),
|
||||
"out" => Direction::Out(amount, seconds),
|
||||
_ => {
|
||||
error!("Unrecognized PTZ direction \"{}\"", direction_txt);
|
||||
continue;
|
||||
}
|
||||
};
|
||||
reply = Some(
|
||||
event_cam_sender
|
||||
.send_message_with_reply(Messages::Ptz(direction))
|
||||
.await
|
||||
.with_context(|| "Failed to send PTZ")?,
|
||||
);
|
||||
} else {
|
||||
error!("seconds was not a valid number (unrecognized)");
|
||||
}
|
||||
MqttReplyRef {
|
||||
topic: "control/pir",
|
||||
message: "on",
|
||||
} => {
|
||||
reply = Some(
|
||||
event_cam_sender
|
||||
.send_message_with_reply(Messages::PIROn)
|
||||
.await
|
||||
.with_context(|| "Failed to set pir on")?,
|
||||
);
|
||||
}
|
||||
MqttReplyRef {
|
||||
topic: "control/pir",
|
||||
message: "off",
|
||||
} => {
|
||||
reply = Some(
|
||||
event_cam_sender
|
||||
.send_message_with_reply(Messages::PIROff)
|
||||
.await
|
||||
.with_context(|| "Failed to set pir off")?,
|
||||
);
|
||||
}
|
||||
MqttReplyRef {
|
||||
topic: "query/battery",
|
||||
..
|
||||
} => {
|
||||
reply = Some(
|
||||
event_cam_sender
|
||||
.send_message_with_reply(Messages::Battery)
|
||||
.await
|
||||
.with_context(|| "Failed to get battery status")?,
|
||||
);
|
||||
reply_topic = Some("status/battery");
|
||||
}
|
||||
MqttReplyRef {
|
||||
topic: "query/pir", ..
|
||||
} => {
|
||||
reply = Some(
|
||||
event_cam_sender
|
||||
.send_message_with_reply(Messages::PIRQuery)
|
||||
.await
|
||||
.with_context(|| "Failed to get pir status")?,
|
||||
);
|
||||
reply_topic = Some("status/pir");
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
} else {
|
||||
error!("No PTZ direction speed was not a valid number");
|
||||
if let Some(reply) = reply {
|
||||
if let Some(topic) = reply_topic {
|
||||
mqtt_sender_mqtt
|
||||
.send_message(topic, &reply, false)
|
||||
.await
|
||||
.with_context(|| "Failed to send Camera reply to Mqtt")?;
|
||||
} else {
|
||||
mqtt_sender_mqtt
|
||||
.send_message(&msg.topic, &reply, false)
|
||||
.await
|
||||
.with_context(|| "Failed to send Camera reply to Mqtt")?;
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}.await;
|
||||
// If there is an error we pass it to the channel
|
||||
// this allows for async error handelling
|
||||
if let Err(e) = result {
|
||||
let _ = error_send.try_send(e);
|
||||
}
|
||||
} else {
|
||||
error!("No PTZ Direction given. Please add up/down/left/right/in/out");
|
||||
}
|
||||
});
|
||||
}
|
||||
MqttReplyRef {
|
||||
topic: "control/pir",
|
||||
message: "on",
|
||||
} => {
|
||||
reply = Some(
|
||||
event_cam_sender
|
||||
.send_message_with_reply(Messages::PIROn)
|
||||
.await
|
||||
.with_context(|| "Failed to set pir on")?,
|
||||
);
|
||||
}
|
||||
MqttReplyRef {
|
||||
topic: "control/pir",
|
||||
message: "off",
|
||||
} => {
|
||||
reply = Some(
|
||||
event_cam_sender
|
||||
.send_message_with_reply(Messages::PIROff)
|
||||
.await
|
||||
.with_context(|| "Failed to set pir off")?,
|
||||
);
|
||||
}
|
||||
MqttReplyRef {
|
||||
topic: "query/battery",
|
||||
..
|
||||
} => {
|
||||
reply = Some(
|
||||
event_cam_sender
|
||||
.send_message_with_reply(Messages::Battery)
|
||||
.await
|
||||
.with_context(|| "Failed to get battery status")?,
|
||||
);
|
||||
reply_topic = Some("status/battery");
|
||||
}
|
||||
MqttReplyRef {
|
||||
topic: "query/pir", ..
|
||||
} => {
|
||||
reply = Some(
|
||||
event_cam_sender
|
||||
.send_message_with_reply(Messages::PIRQuery)
|
||||
.await
|
||||
.with_context(|| "Failed to get pir status")?,
|
||||
);
|
||||
reply_topic = Some("status/pir");
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
if let Some(reply) = reply {
|
||||
if let Some(topic) = reply_topic {
|
||||
mqtt_sender_mqtt
|
||||
.send_message(topic, &reply, false)
|
||||
.await
|
||||
.with_context(|| "Failed to send Camera reply to Mqtt")?;
|
||||
} else {
|
||||
mqtt_sender_mqtt
|
||||
.send_message(&msg.topic, &reply, false)
|
||||
.await
|
||||
.with_context(|| "Failed to send Camera reply to Mqtt")?;
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
} => v,
|
||||
// Wait on an error and if we get it we abort
|
||||
v = error_recv.recv() => Err(v.unwrap()),
|
||||
}
|
||||
Result::<(), Error>::Ok(())
|
||||
};
|
||||
|
||||
let cam_to_mqtt = async {
|
||||
|
||||
@@ -43,6 +43,7 @@ struct MqttReciever {
|
||||
name: String,
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
pub(crate) struct MqttSender {
|
||||
client: Arc<AsyncClient>,
|
||||
name: String,
|
||||
|
||||
Reference in new issue
Block a user