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

lil reformatting + log changes

Browse source
This commit is contained in:
Alex Janka 2024-03-07 09:44:34 +11:00
parent 9ea54102af
commit 8d5c8e85c6
5 changed files with 97 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
homekit-controller/src/discovery.rs Normal file
View file

@ -0,0 +1,74 @@
use crate::homekit_http::DiscoveryError;
use futures_util::{pin_mut, StreamExt};
use mdns::RecordKind;
use std::{collections::HashMap, sync::Arc, time::Duration};
use tokio::sync::RwLock;
// (id, (ip, port))
// id - from TXT record
// ip - from A record
// port - from SRV record
pub type MdnsDiscoveredList = Arc<RwLock<HashMap<String, (String, u16)>>>;
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);
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((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
}) {
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;
if !connections.get(&id).is_some_and(|(old_ip, old_port)| {
*old_ip == ip.to_string() && *old_port == port
}) {
log::info!(
"mdns: discovered {name} - id: {id}, ip: {ip}, port: {port}"
);
connections.insert(id, (ip.to_string(), port));
}
}
}
}
}
tokio::time::sleep(Duration::from_secs(5 * 60)).await;
}
});
Ok(r_discovered)
}

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

@ -15,9 +15,10 @@ use tokio::{
};
use crate::{
discovery::MdnsDiscoveredList,
pairing_data::{Accessory, ServiceCharacteristic},
tlv8::TlvEncode,
ConnectionError, HomekitError, MdnsDiscoveredList,
ConnectionError, HomekitError,
};
pub(super) struct AccessorySocket {

91
homekit-controller/src/lib.rs
View file

@ -1,26 +1,26 @@
use chacha20poly1305::{
aead::generic_array::GenericArray, AeadInPlace, ChaCha20Poly1305, KeyInit, Nonce,
};
use ed25519_dalek::{Signer, Verifier};
use futures_util::{pin_mut, StreamExt};
use hkdf::Hkdf;
use homekit_http::DiscoveryError;
use mdns::RecordKind;
use sha2::Sha512;
use std::{collections::HashMap, path::PathBuf, sync::Arc, time::Duration};
use std::{collections::HashMap, path::PathBuf};
use thiserror::Error;
use tlv8::{HomekitState, TlvEncode, TlvError, TlvType};
use tokio::sync::RwLock;
use x25519_dalek::{EphemeralSecret, PublicKey};
use pairing_data::{Accessory, PythonPairingData};
pub use crate::pairing_data::{CharacteristicType, Data, ServiceType};
pub use crate::{
discovery::{spawn_discover_thread, MdnsDiscoveredList},
pairing_data::{CharacteristicType, Data, ServiceType},
};
use crate::{
homekit_http::AccessorySocket,
tlv8::{decode, TlvEncodableData},
homekit_http::{AccessorySocket, DiscoveryError},
pairing_data::{Accessory, PythonPairingData},
tlv8::{decode, HomekitState, TlvEncodableData, TlvEncode, TlvError, TlvType},
};
mod discovery;
mod homekit_http;
mod pairing_data;
mod tlv8;
@ -60,75 +60,6 @@ impl PythonPairingData {
}
}
// (id, (ip, port))
// id - from TXT record
// ip - from A record
// port - from SRV record
pub type MdnsDiscoveredList = Arc<RwLock<HashMap<String, (String, u16)>>>;
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);
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((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
}) {
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;
if !connections.get(&id).is_some_and(|(old_ip, old_port)| {
*old_ip == ip.to_string() && *old_port == port
}) {
log::info!(
"mdns: discovered {name} - id: {id}, ip: {ip}, port: {port}"
);
connections.insert(id, (ip.to_string(), port));
}
}
}
}
}
tokio::time::sleep(Duration::from_secs(5 * 60)).await;
}
});
Ok(r_discovered)
}
struct DevicePairingData {
accessory_pairing_id: String,
accessory_ip: String,

2
homekit-exporter/packaging/service/service
View file

@ -7,7 +7,7 @@ StartLimitIntervalSec=0
Type=simple
Restart=always
RestartSec=10s
Environment="RUST_LOG=error,warn"
Environment="RUST_LOG=error,warn,mdns=off"
Environment="LOG_TIMESTAMP=false"
ExecStart=/usr/bin/homekit-exporter watch

16
homekit-exporter/src/main.rs
View file

@ -75,7 +75,7 @@ async fn discover() -> Result<(), mdns::Error> {
async fn init(pairing_data: PathBuf) -> Result<HashMap<String, DeviceConnection>, HomekitError> {
let discovered = spawn_discover_thread()?;
tokio::time::sleep(Duration::from_secs(1)).await;
tokio::time::sleep(Duration::from_secs(2)).await;
if pairing_data.is_file() {
let devices = homekit_controller::load(pairing_data)?;
let mut connected_devices = HashMap::new();
@ -84,13 +84,15 @@ async fn init(pairing_data: PathBuf) -> Result<HashMap<String, DeviceConnection>
let connected = loop {
match v.connect(&discovered).await {
Ok(v) => break Some(v),
Err(e) => log::error!("error connecting to {k}: {e:#?}"),
Err(e) => {
num += 1;
if num > 10 {
log::error!("error connecting to {k}: {e:?}");
break None;
}
}
}
num += 1;
if num > 10 {
break None;
}
tokio::time::sleep(Duration::from_millis(100)).await;
tokio::time::sleep(Duration::from_millis(250)).await;
};
connected_devices.insert(k, connected.ok_or(HomekitError::DeviceNotFound)?);
}