alex/homekit-logger
1
0
Fork 0
Code Actions Packages Releases 1 Activity

better timeouts/reconnect

Browse source
This commit is contained in:
Alex Janka 2024-03-07 09:36:11 +11:00
parent 341c347d3c
commit 9ea54102af
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
homekit-controller/src/homekit_http.rs
View file

@ -277,6 +277,12 @@ impl AccessorySocket {
Ok(packet) Ok(packet)
} }
async fn reconnect(&mut self) -> Result<TcpStream, std::io::Error> {
self.socket.flush().await?;
self.socket.shutdown().await?;
TcpStream::connect(format!("{}:{}", self.ip, self.port)).await
}
async fn get_next(&mut self) -> Result<Vec<u8>, HomekitError> { async fn get_next(&mut self) -> Result<Vec<u8>, HomekitError> {
// max packet size + authtag size + associated data size // max packet size + authtag size + associated data size
let mut buf = [0; 1024 + 16 + 2]; let mut buf = [0; 1024 + 16 + 2];
@ -286,19 +292,26 @@ impl AccessorySocket {
while read_num == 0 { while read_num == 0 {
if tries > 20 { if tries > 20 {
log::error!("unsuccessfully tried to reconnect"); log::error!("reconnect unsuccessful");
return Err(ConnectionError::Http.into()); return Err(ConnectionError::Http.into());
} }
tries += 1; tries += 1;
log::info!("read 0 bytes - about to reconnect"); log::info!("read 0 bytes - about to reconnect");
std::thread::sleep(std::time::Duration::from_millis(200)); std::thread::sleep(std::time::Duration::from_millis(200));
self.socket.flush().await?;
log::warn!("reconnecting..."); match tokio::time::timeout(Duration::from_secs(5), self.reconnect()).await {
self.socket = TcpStream::connect(format!("{}:{}", self.ip, self.port)).await?; Ok(Ok(socket)) => self.socket = socket,
_ => continue,
read_num = self.socket.read(&mut buf).await?;
} }
read_num =
match tokio::time::timeout(Duration::from_secs(5), self.socket.read(&mut buf)).await
{
Ok(Ok(val)) => val,
_ => continue,
}
}
if let Some(encryption) = self.socket_encryption.as_mut() { if let Some(encryption) = self.socket_encryption.as_mut() {
let associated_data: [u8; 2] = buf[..2].try_into()?; let associated_data: [u8; 2] = buf[..2].try_into()?;
let length = u16::from_le_bytes(associated_data); let length = u16::from_le_bytes(associated_data);