discover thread: runs discovery every 5 minutes

Cargo.lock

@@ -1143,7 +1143,7 @@ dependencies = [
 
 [[package]]
 name = "homekit-exporter"
-version = "0.1.0"
+version = "0.2.0"
 dependencies = [
  "clap",
  "env_logger",

homekit-controller/src/homekit_http.rs

@@ -12,7 +12,6 @@ use tokio::{
 
 use crate::{
     pairing_data::{Accessory, ServiceCharacteristic},
-    spawn_discover_thread,
     tlv8::TlvEncode,
     ConnectionError, HomekitError, MdnsDiscoveredList,
 };
@@ -53,14 +52,7 @@ async fn reconnect(
         .ok_or(ConnectionError::Discovery(DiscoveryError::NotFound))?
         .clone();
 
-    let socket = match TcpStream::connect(format!("{hostname}:{port}")).await {
-        Ok(socket) => socket,
-        Err(_) => {
-            spawn_discover_thread(discovered.clone())?;
-            tokio::time::sleep(Duration::from_secs(1)).await;
-            TcpStream::connect(format!("{hostname}:{port}")).await?
-        }
-    };
+    let socket = TcpStream::connect(format!("{hostname}:{port}")).await?;
     Ok(socket)
 }
 
@@ -284,7 +276,6 @@ impl AccessorySocket {
     async fn get_next(&mut self) -> Result<Vec<u8>, HomekitError> {
         // max packet size + authtag size + associated data size
         let mut buf = [0; 1024 + 16 + 2];
-        // let mut buf = [0; 1536];
 
         let mut read_num = self.socket.read(&mut buf).await?;
         let mut tries = 0;

homekit-controller/src/lib.rs

@@ -62,55 +62,60 @@ impl PythonPairingData {
 
 pub type MdnsDiscoveredList = Arc<RwLock<HashMap<String, (String, u16)>>>;
 
-pub fn spawn_discover_thread(discovered: MdnsDiscoveredList) -> Result<(), DiscoveryError> {
+pub fn spawn_discover_thread() -> Result<MdnsDiscoveredList, DiscoveryError> {
+    let discovered = Arc::new(RwLock::new(HashMap::new()));
+    let r_discovered = discovered.clone();
     let stream = mdns::discover::all("_hap._tcp.local", Duration::from_secs(1))?.listen();
     tokio::task::spawn(async move {
         pin_mut!(stream);
-        while let Some(Ok(response)) = stream.next().await {
-            let all = response
-                .answers
-                .iter()
-                .chain(response.additional.iter())
-                .collect::<Vec<_>>();
-            if let Some((name, id)) = all.iter().find_map(|record| {
-                if let RecordKind::TXT(v) = &record.kind {
-                    if let Some(id_string) = v.iter().find(|v| v.contains("id=")) {
-                        let id = id_string[3..].to_string();
-                        return Some((record.name.clone(), id));
-                    }
-                }
-                None
-            }) {
-                if let Some((target, port)) = all.iter().find_map(|record| {
-                    if record.name == name {
-                        if let RecordKind::SRV {
-                            priority: _,
-                            weight: _,
-                            port,
-                            target,
-                        } = &record.kind
-                        {
-                            return Some((target.clone(), *port));
+        loop {
+            while let Some(Ok(response)) = stream.next().await {
+                let all = response
+                    .answers
+                    .iter()
+                    .chain(response.additional.iter())
+                    .collect::<Vec<_>>();
+                if let Some((name, id)) = all.iter().find_map(|record| {
+                    if let RecordKind::TXT(v) = &record.kind {
+                        if let Some(id_string) = v.iter().find(|v| v.contains("id=")) {
+                            let id = id_string[3..].to_string();
+                            return Some((record.name.clone(), id));
                         }
                     }
                     None
                 }) {
-                    if let Some(ip) = all.iter().find_map(|record| {
-                        if record.name == target {
-                            if let RecordKind::A(ip) = record.kind {
-                                return Some(ip);
+                    if let Some((target, port)) = all.iter().find_map(|record| {
+                        if record.name == name {
+                            if let RecordKind::SRV {
+                                priority: _,
+                                weight: _,
+                                port,
+                                target,
+                            } = &record.kind
+                            {
+                                return Some((target.clone(), *port));
                             }
                         }
                         None
                     }) {
-                        let mut connections = discovered.write().await;
-                        connections.insert(id, (ip.to_string(), port));
+                        if let Some(ip) = all.iter().find_map(|record| {
+                            if record.name == target {
+                                if let RecordKind::A(ip) = record.kind {
+                                    return Some(ip);
+                                }
+                            }
+                            None
+                        }) {
+                            let mut connections = discovered.write().await;
+                            connections.insert(id, (ip.to_string(), port));
+                        }
                     }
                 }
             }
+            tokio::time::sleep(Duration::from_secs(5 * 60)).await;
         }
     });
-    Ok(())
+    Ok(r_discovered)
 }
 
 struct DevicePairingData {

homekit-controller/src/tlv8/mod.rs

@@ -117,12 +117,6 @@ pub trait TlvEncode {
     fn encode(&self) -> Vec<u8>;
 }
 
-// impl<const N: usize> TlvEncode for &[(u8, Vec<u8>); N] {
-//     fn encode(&self) -> Vec<u8> {
-//         (*self as &[(u8, Vec<u8>)]).encode()
-//     }
-// }
-
 impl<T> TlvEncode for T
 where
     T: AsRef<[(u8, Vec<u8>)]>,

homekit-exporter/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "homekit-exporter"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 license = "Apache-2.0"
 description = "Prometheus exporter for HomeKit sensors"

homekit-exporter/packaging/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Alex Janka <alex@alexjanka.com>
 
 pkgname=homekit-logger
-pkgver=0.1.0
+pkgver=0.2.0
 pkgrel=1
 pkgdesc="Prometheus exporter for HomeKit sensors"
 arch=('x86_64' 'aarch64')

homekit-exporter/src/main.rs

@@ -1,12 +1,11 @@
 #[macro_use]
 extern crate rocket;
 
-use std::{collections::HashMap, path::PathBuf, sync::Arc, time::Duration};
+use std::{collections::HashMap, path::PathBuf, time::Duration};
 
 use clap::Parser;
 use homekit_controller::{spawn_discover_thread, DeviceConnection, HomekitError, ServiceType};
 use server::launch;
-use tokio::sync::RwLock;
 
 mod server;
 
@@ -44,8 +43,7 @@ async fn rocket() -> rocket::Rocket<rocket::Build> {
 }
 
 async fn init(pairing_data: PathBuf) -> Result<HashMap<String, DeviceConnection>, HomekitError> {
-    let discovered = Arc::new(RwLock::new(HashMap::new()));
-    spawn_discover_thread(discovered.clone())?;
+    let discovered = spawn_discover_thread()?;
     tokio::time::sleep(Duration::from_secs(1)).await;
     if pairing_data.is_file() {
         let devices = homekit_controller::load(pairing_data)?;