Compare commits
3 commits
dca67cb66e
...
af3a618529
Author | SHA1 | Date | |
---|---|---|---|
Alex Janka | af3a618529 | ||
Alex Janka | d2bc889b53 | ||
Alex Janka | 589542ec0b |
2
Cargo.lock
generated
2
Cargo.lock
generated
|
@ -1143,7 +1143,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "homekit-exporter"
|
||||
version = "0.3.0"
|
||||
version = "0.4.0"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"env_logger",
|
||||
|
|
|
@ -21,6 +21,7 @@ use crate::{
|
|||
ConnectionError, HomekitError,
|
||||
};
|
||||
|
||||
#[derive(Debug)]
|
||||
pub(super) struct AccessorySocket {
|
||||
socket: TcpStream,
|
||||
ip: String,
|
||||
|
@ -28,6 +29,7 @@ pub(super) struct AccessorySocket {
|
|||
socket_encryption: Option<SocketEncryption>,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
struct SocketEncryption {
|
||||
controller_to_accessory_key: [u8; 32],
|
||||
controller_to_accessory_counter: u64,
|
||||
|
|
|
@ -60,6 +60,7 @@ impl PythonPairingData {
|
|||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
struct DevicePairingData {
|
||||
accessory_pairing_id: String,
|
||||
accessory_ip: String,
|
||||
|
@ -69,6 +70,7 @@ struct DevicePairingData {
|
|||
ios_device_ltsk: [u8; 32],
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct DeviceConnection {
|
||||
pub accessories: HashMap<usize, Accessory>,
|
||||
discovered: MdnsDiscoveredList,
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "homekit-exporter"
|
||||
version = "0.3.0"
|
||||
version = "0.4.0"
|
||||
edition = "2021"
|
||||
license = "Apache-2.0"
|
||||
description = "Prometheus exporter for HomeKit sensors"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Maintainer: Alex Janka <alex@alexjanka.com>
|
||||
|
||||
pkgname=homekit-logger
|
||||
pkgver=0.3.0
|
||||
pkgver=0.4.0
|
||||
pkgrel=1
|
||||
pkgdesc="Prometheus exporter for HomeKit sensors"
|
||||
arch=('x86_64' 'aarch64')
|
||||
|
|
|
@ -5,7 +5,9 @@ use std::{collections::HashMap, path::PathBuf, time::Duration};
|
|||
|
||||
use clap::{Parser, Subcommand};
|
||||
use futures_util::{pin_mut, StreamExt};
|
||||
use homekit_controller::{spawn_discover_thread, DeviceConnection, HomekitError, ServiceType};
|
||||
use homekit_controller::{
|
||||
spawn_discover_thread, CharacteristicType, DeviceConnection, HomekitError,
|
||||
};
|
||||
use server::launch;
|
||||
|
||||
mod server;
|
||||
|
@ -29,18 +31,14 @@ enum Commands {
|
|||
Discover,
|
||||
}
|
||||
|
||||
const SENSORS: [ServiceType; 11] = [
|
||||
ServiceType::AirQualitySensor,
|
||||
ServiceType::CarbonDioxideSensor,
|
||||
ServiceType::CarbonMonoxideSensor,
|
||||
ServiceType::ContactSensor,
|
||||
ServiceType::HumiditySensor,
|
||||
ServiceType::LeakSensor,
|
||||
ServiceType::LightSensor,
|
||||
ServiceType::MotionSensor,
|
||||
ServiceType::OccupancySensor,
|
||||
ServiceType::SmokeSensor,
|
||||
ServiceType::TemperatureSensor,
|
||||
const MONITORED_CHARACTERISTICS: [CharacteristicType; 7] = [
|
||||
CharacteristicType::CurrentTemperature,
|
||||
CharacteristicType::PM2_5Density,
|
||||
CharacteristicType::PM10Density,
|
||||
CharacteristicType::AirQuality,
|
||||
CharacteristicType::CurrentRelativeHumidity,
|
||||
CharacteristicType::AirParticulateDensity,
|
||||
CharacteristicType::AirParticulateSize,
|
||||
];
|
||||
|
||||
#[launch]
|
||||
|
|
|
@ -3,7 +3,7 @@ use rocket::State;
|
|||
use std::{collections::HashMap, ops::DerefMut};
|
||||
use tokio::sync::Mutex;
|
||||
|
||||
use crate::SENSORS;
|
||||
use crate::MONITORED_CHARACTERISTICS;
|
||||
|
||||
pub fn launch(
|
||||
paired: HashMap<String, DeviceConnection>,
|
||||
|
@ -25,11 +25,10 @@ pub async fn metrics(state: &State<Mutex<HashMap<String, DeviceConnection>>>) ->
|
|||
|
||||
for (aid, accessory) in &connected.accessories {
|
||||
for service in accessory.services.values() {
|
||||
if !SENSORS.contains(&service.service_type) {
|
||||
continue;
|
||||
}
|
||||
|
||||
for (cid, characteristic) in &service.characteristics {
|
||||
if !MONITORED_CHARACTERISTICS.contains(&characteristic.characteristic_type) {
|
||||
continue;
|
||||
}
|
||||
if let Some(value) = &characteristic.value {
|
||||
if !shown_types.contains(&characteristic.characteristic_type) {
|
||||
s.push_str(
|
||||
|
|
Loading…
Reference in a new issue