Add periodic session cleanup

This commit is contained in:
QuantumEntangledAndy committed 2023-10-12 06:09:50 +07:00
1 parent e362ff1b0a
commit 0aa9b347cc
14 files changed
+42 -25

No files matched your search

+1 -1
View File
@@ -30,7 +30,7 @@ impl BcCamera {
sub_get.send(get).await?;
let msg = sub_get.recv().await?;
if msg.meta.response_code != 200 {
return Err(Error::CameraServiceUnavaliable);
return Err(Error::CameraServiceUnavaliable(msg.meta.response_code));
}
if let BcBody::ModernMsg(ModernMsg {
+2 -2
View File
@@ -36,8 +36,8 @@ pub enum Error {
},
/// Raised when the camera responds with a status code over than OK
#[error(display = "Camera responded with Service Unavaliable")]
CameraServiceUnavaliable,
#[error(display = "Camera responded with Service Unavaliable: {}", _0)]
CameraServiceUnavaliable(u16),
/// Raised when the camera responds with a status code over than OK during login
#[error(display = "Camera responded with Err during login")]
+1 -1
View File
@@ -29,7 +29,7 @@ impl BcCamera {
sub_get.send(get).await?;
let msg = sub_get.recv().await?;
if msg.meta.response_code != 200 {
return Err(Error::CameraServiceUnavaliable);
return Err(Error::CameraServiceUnavaliable(msg.meta.response_code));
}
if let BcBody::ModernMsg(ModernMsg {
+1 -1
View File
@@ -27,7 +27,7 @@ impl BcCamera {
sub_get.send(get).await?;
let msg = sub_get.recv().await?;
if msg.meta.response_code != 200 {
return Err(Error::CameraServiceUnavaliable);
return Err(Error::CameraServiceUnavaliable(msg.meta.response_code));
}
if let BcBody::ModernMsg(ModernMsg {
+3 -3
View File
@@ -39,10 +39,10 @@ impl BcCamera {
reties += 1;
continue;
} else {
return Err(Error::CameraServiceUnavaliable);
return Err(Error::CameraServiceUnavaliable(msg.meta.response_code));
}
} else if msg.meta.response_code != 200 {
return Err(Error::CameraServiceUnavaliable);
return Err(Error::CameraServiceUnavaliable(msg.meta.response_code));
} else {
// Valid message with response_code == 200
if let BcBody::ModernMsg(ModernMsg {
@@ -101,7 +101,7 @@ impl BcCamera {
{
let msg = reply?;
if msg.meta.response_code != 200 {
return Err(Error::CameraServiceUnavaliable);
return Err(Error::CameraServiceUnavaliable(msg.meta.response_code));
}
if let BcMeta {
+1 -1
View File
@@ -64,7 +64,7 @@ impl BcCamera {
sub.send(msg).await?;
let msg = sub.recv().await?;
if msg.meta.response_code != 200 {
return Err(Error::CameraServiceUnavaliable);
return Err(Error::CameraServiceUnavaliable(msg.meta.response_code));
}
Ok(())
+2 -2
View File
@@ -41,7 +41,7 @@ impl BcCamera {
sub_get.send(get).await?;
let msg = sub_get.recv().await?;
if msg.meta.response_code != 200 {
return Err(Error::CameraServiceUnavaliable);
return Err(Error::CameraServiceUnavaliable(msg.meta.response_code));
}
if let BcBody::ModernMsg(ModernMsg {
@@ -132,7 +132,7 @@ impl BcCamera {
}
} else {
// anything else is an error
return Err(Error::CameraServiceUnavaliable);
return Err(Error::CameraServiceUnavaliable(msg.meta.response_code));
}
// let binary_stream = sub_get.payload_stream();
+2 -2
View File
@@ -271,7 +271,7 @@ impl BcCamera {
msg_id: MSG_ID_VIDEO_STOP,
..
} = msg.meta {
return Err(Error::CameraServiceUnavaliable);
return Err(Error::CameraServiceUnavaliable(msg.meta.response_code));
}
}
} => v,
@@ -352,7 +352,7 @@ impl BcCamera {
let reply = sub_video.recv().await?;
if reply.meta.response_code != 200 {
return Err(super::Error::CameraServiceUnavaliable);
return Err(Error::CameraServiceUnavaliable(reply.meta.response_code));
}
Ok(())
+1 -1
View File
@@ -27,7 +27,7 @@ impl BcCamera {
sub_get.send(get).await?;
let msg = sub_get.recv().await?;
if msg.meta.response_code != 200 {
return Err(Error::CameraServiceUnavaliable);
return Err(Error::CameraServiceUnavaliable(msg.meta.response_code));
}
if let BcBody::ModernMsg(ModernMsg {
+1 -1
View File
@@ -33,7 +33,7 @@ impl BcCamera {
sub_get_general.send(get).await?;
let msg = sub_get_general.recv().await?;
if msg.meta.response_code != 200 {
return Err(Error::CameraServiceUnavaliable);
return Err(Error::CameraServiceUnavaliable(msg.meta.response_code));
}
if let BcBody::ModernMsg(ModernMsg {
+1 -1
View File
@@ -25,7 +25,7 @@ impl BcCamera {
sub_get.send(get).await?;
let msg = sub_get.recv().await?;
if msg.meta.response_code != 200 {
return Err(Error::CameraServiceUnavaliable);
return Err(Error::CameraServiceUnavaliable(msg.meta.response_code));
}
if let BcBody::ModernMsg(ModernMsg {
+3 -1
View File
@@ -27,7 +27,9 @@ impl BcCamera {
let modern_reply = sub_version.recv().await?;
if modern_reply.meta.response_code != 200 {
return Err(Error::CameraServiceUnavaliable);
return Err(Error::CameraServiceUnavaliable(
modern_reply.meta.response_code,
));
}
let version_info;
match modern_reply.body {
+21 -6
View File
@@ -7,9 +7,12 @@
use anyhow::{anyhow, Context};
use futures::TryFutureExt;
use std::sync::{Arc, Weak};
use tokio::sync::{
mpsc::Sender as MpscSender, oneshot::channel as oneshot, watch::channel as watch,
watch::Receiver as WatchReceiver,
use tokio::{
sync::{
mpsc::Sender as MpscSender, oneshot::channel as oneshot, watch::channel as watch,
watch::Receiver as WatchReceiver,
},
time::{sleep, Duration},
};
use tokio_util::sync::CancellationToken;
@@ -116,9 +119,21 @@ impl NeoInstance {
v = async {
if let Some(cam) = camera.clone() {
let cam_ref = cam.as_ref();
let r = task(cam_ref).await;
if let Err(e) = &r {
log::debug!("- Task Result: {e:?}");
let mut r = Err(anyhow!("No run"));
for _ in 0..5 {
r = task(cam_ref).await;
if let Err(e) = &r {
log::debug!("- Task Result: {e:?}");
}
if let Err(Some(neolink_core::Error::CameraServiceUnavaliable(400))) = r.as_ref().map_err(|e| e.downcast_ref::<neolink_core::Error>()) {
// Retryable without a reconnect
// Usually occurs when camera is starting up
// or the connection is initialising
sleep(Duration::from_secs(1)).await;
continue;
} else {
break;
}
}
r
} else {
+2 -2
View File
@@ -457,7 +457,7 @@ async fn listen_on_camera(camera: NeoInstance, mqtt_instance: MqttInstance) -> R
}).await;
let image = match image {
Err(e) => match e.downcast::<neolink_core::Error>() {
Ok(neolink_core::Error::CameraServiceUnavaliable) => {
Ok(neolink_core::Error::CameraServiceUnavaliable(_)) => {
log::debug!("Image not supported");
futures::future::pending().await
},
@@ -502,7 +502,7 @@ async fn listen_on_camera(camera: NeoInstance, mqtt_instance: MqttInstance) -> R
}).await;
let xml = match xml {
Err(e) => match e.downcast::<neolink_core::Error>() {
Ok(neolink_core::Error::CameraServiceUnavaliable) => {
Ok(neolink_core::Error::CameraServiceUnavaliable(_)) => {
log::debug!("Battery not supported");
futures::future::pending().await
},