From 0aa9b347cc2a21184e329318d105e27245cf4da2 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Thu, 12 Oct 2023 06:09:50 +0700 Subject: [PATCH] Add periodic session cleanup --- crates/core/src/bc_protocol/abilityinfo.rs | 2 +- crates/core/src/bc_protocol/errors.rs | 4 ++-- crates/core/src/bc_protocol/ledstate.rs | 2 +- crates/core/src/bc_protocol/link.rs | 2 +- crates/core/src/bc_protocol/pirstate.rs | 6 ++--- crates/core/src/bc_protocol/pushinfo.rs | 2 +- crates/core/src/bc_protocol/snap.rs | 4 ++-- crates/core/src/bc_protocol/stream.rs | 4 ++-- crates/core/src/bc_protocol/stream_info.rs | 2 +- crates/core/src/bc_protocol/time.rs | 2 +- crates/core/src/bc_protocol/uid.rs | 2 +- crates/core/src/bc_protocol/version.rs | 4 +++- src/common/instance.rs | 27 +++++++++++++++++----- src/mqtt/mod.rs | 4 ++-- 14 files changed, 42 insertions(+), 25 deletions(-) diff --git a/crates/core/src/bc_protocol/abilityinfo.rs b/crates/core/src/bc_protocol/abilityinfo.rs index b1d2123..ff82529 100644 --- a/crates/core/src/bc_protocol/abilityinfo.rs +++ b/crates/core/src/bc_protocol/abilityinfo.rs @@ -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 { diff --git a/crates/core/src/bc_protocol/errors.rs b/crates/core/src/bc_protocol/errors.rs index 183196d..47471d6 100644 --- a/crates/core/src/bc_protocol/errors.rs +++ b/crates/core/src/bc_protocol/errors.rs @@ -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")] diff --git a/crates/core/src/bc_protocol/ledstate.rs b/crates/core/src/bc_protocol/ledstate.rs index f1c33c8..a2a8d26 100644 --- a/crates/core/src/bc_protocol/ledstate.rs +++ b/crates/core/src/bc_protocol/ledstate.rs @@ -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 { diff --git a/crates/core/src/bc_protocol/link.rs b/crates/core/src/bc_protocol/link.rs index 514e5d9..f81c0ec 100644 --- a/crates/core/src/bc_protocol/link.rs +++ b/crates/core/src/bc_protocol/link.rs @@ -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 { diff --git a/crates/core/src/bc_protocol/pirstate.rs b/crates/core/src/bc_protocol/pirstate.rs index 83cd255..a5242e0 100644 --- a/crates/core/src/bc_protocol/pirstate.rs +++ b/crates/core/src/bc_protocol/pirstate.rs @@ -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 { diff --git a/crates/core/src/bc_protocol/pushinfo.rs b/crates/core/src/bc_protocol/pushinfo.rs index d3ad0ca..9da38b3 100644 --- a/crates/core/src/bc_protocol/pushinfo.rs +++ b/crates/core/src/bc_protocol/pushinfo.rs @@ -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(()) diff --git a/crates/core/src/bc_protocol/snap.rs b/crates/core/src/bc_protocol/snap.rs index 4983b60..e199d8c 100644 --- a/crates/core/src/bc_protocol/snap.rs +++ b/crates/core/src/bc_protocol/snap.rs @@ -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(); diff --git a/crates/core/src/bc_protocol/stream.rs b/crates/core/src/bc_protocol/stream.rs index 26a499d..60bbfd7 100644 --- a/crates/core/src/bc_protocol/stream.rs +++ b/crates/core/src/bc_protocol/stream.rs @@ -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(()) diff --git a/crates/core/src/bc_protocol/stream_info.rs b/crates/core/src/bc_protocol/stream_info.rs index 900c4c2..af34614 100644 --- a/crates/core/src/bc_protocol/stream_info.rs +++ b/crates/core/src/bc_protocol/stream_info.rs @@ -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 { diff --git a/crates/core/src/bc_protocol/time.rs b/crates/core/src/bc_protocol/time.rs index 91aec3e..fd28306 100644 --- a/crates/core/src/bc_protocol/time.rs +++ b/crates/core/src/bc_protocol/time.rs @@ -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 { diff --git a/crates/core/src/bc_protocol/uid.rs b/crates/core/src/bc_protocol/uid.rs index bb57b1e..553172a 100644 --- a/crates/core/src/bc_protocol/uid.rs +++ b/crates/core/src/bc_protocol/uid.rs @@ -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 { diff --git a/crates/core/src/bc_protocol/version.rs b/crates/core/src/bc_protocol/version.rs index df7779b..ef73345 100644 --- a/crates/core/src/bc_protocol/version.rs +++ b/crates/core/src/bc_protocol/version.rs @@ -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 { diff --git a/src/common/instance.rs b/src/common/instance.rs index a3010ce..43e8ab7 100644 --- a/src/common/instance.rs +++ b/src/common/instance.rs @@ -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::()) { + // 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 { diff --git a/src/mqtt/mod.rs b/src/mqtt/mod.rs index da789fb..421a7d8 100644 --- a/src/mqtt/mod.rs +++ b/src/mqtt/mod.rs @@ -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::() { - 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::() { - Ok(neolink_core::Error::CameraServiceUnavaliable) => { + Ok(neolink_core::Error::CameraServiceUnavaliable(_)) => { log::debug!("Battery not supported"); futures::future::pending().await },