VCC/vcs-controller
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed pong messages being sent to the wrong socket

Browse source
This commit is contained in:
Nickiel12 2024-07-04 09:03:31 -07:00
parent 047a180664
commit 0a47c7a958
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/coordinator/mod.rs
View file

@ -193,9 +193,11 @@ pub async fn start_coordinator(
y_adj = y; y_adj = y;
} }
Err(e) => { Err(e) => {
if state.tracker_state.tracking_id > 0 {
info!("Could not calculate the tracking!: {e}"); info!("Could not calculate the tracking!: {e}");
} }
} }
}
let me = MoveEvent { x: x_adj, y: y_adj }; let me = MoveEvent { x: x_adj, y: y_adj };
if let Err(e) = state if let Err(e) = state

11
src/coordinator/remote_video_processor.rs
View file

@ -6,7 +6,7 @@ use std::{
use async_recursion::async_recursion; use async_recursion::async_recursion;
use async_channel::Sender; use async_channel::Sender;
use futures_util::{stream::SplitStream, SinkExt, StreamExt, TryStreamExt}; use futures_util::{stream::{SplitSink, SplitStream}, SinkExt, StreamExt, TryStreamExt};
use gstreamer_app::AppSink; use gstreamer_app::AppSink;
use tokio::{net::TcpStream, sync::Mutex, time::sleep_until}; use tokio::{net::TcpStream, sync::Mutex, time::sleep_until};
use tokio_tungstenite::{connect_async, tungstenite::Message, MaybeTlsStream, WebSocketStream}; use tokio_tungstenite::{connect_async, tungstenite::Message, MaybeTlsStream, WebSocketStream};
@ -75,7 +75,7 @@ pub async fn remote_video_loop(
break; break;
} }
let do_not_break = handle_message(&mut recvr, &to_mec, last_iter).await; let do_not_break = handle_message(&mut recvr, &mut sender, &to_mec, last_iter).await;
if !do_not_break { break; } if !do_not_break { break; }
@ -131,6 +131,7 @@ fn get_video_frame(appsink: &AppSink) -> Result<Message, String> {
#[async_recursion] #[async_recursion]
async fn handle_message( async fn handle_message(
recvr: &mut SplitStream<WebSocketStream<MaybeTlsStream<TcpStream>>>, recvr: &mut SplitStream<WebSocketStream<MaybeTlsStream<TcpStream>>>,
sender: &mut SplitSink<WebSocketStream<MaybeTlsStream<TcpStream>>, Message>,
to_mec: &Sender<ApplicationEvent>, to_mec: &Sender<ApplicationEvent>,
last_iter: Instant, last_iter: Instant,
) -> bool { ) -> bool {
@ -144,15 +145,15 @@ async fn handle_message(
Message::Pong(_) | Message::Frame(_) | Message::Text(_) => { Message::Pong(_) | Message::Frame(_) | Message::Text(_) => {
warn!("There was an unhandled message type from the camera: {}\n{}", message, message.to_string()); warn!("There was an unhandled message type from the camera: {}\n{}", message, message.to_string());
// this was not the expected response, recursion! // this was not the expected response, recursion!
return handle_message(recvr, to_mec, last_iter).await; return handle_message(recvr, sender, to_mec, last_iter).await;
} }
Message::Ping(content) => { Message::Ping(content) => {
if let Err(e) = to_mec.send(ApplicationEvent::SocketMessage(Message::Pong(content))).await { if let Err(e) = sender.send(Message::Pong(content)).await {
error!("Video processor could not send message to MEC, exiting: {e}"); error!("Video processor could not send message to MEC, exiting: {e}");
return false; return false;
} }
// this was not the expected response, recursion! // this was not the expected response, recursion!
return handle_message(recvr, to_mec, last_iter).await; return handle_message(recvr, sender, to_mec, last_iter).await;
} }
Message::Binary(bin) => { Message::Binary(bin) => {
let message = std::str::from_utf8(&bin); let message = std::str::from_utf8(&bin);