version bump

Cargo.lock

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

homekit-controller/src/homekit_http.rs

@@ -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,

homekit-controller/src/lib.rs

@@ -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,

homekit-exporter/Cargo.toml

@@ -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"

homekit-exporter/packaging/PKGBUILD

@@ -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')

homekit-exporter/src/main.rs

@@ -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] = [
+const MONITORED_CHARACTERISTICS: [CharacteristicType; 7] = [
-    ServiceType::AirQualitySensor,
+    CharacteristicType::CurrentTemperature,
-    ServiceType::CarbonDioxideSensor,
+    CharacteristicType::PM2_5Density,
-    ServiceType::CarbonMonoxideSensor,
+    CharacteristicType::PM10Density,
-    ServiceType::ContactSensor,
+    CharacteristicType::AirQuality,
-    ServiceType::HumiditySensor,
+    CharacteristicType::CurrentRelativeHumidity,
-    ServiceType::LeakSensor,
+    CharacteristicType::AirParticulateDensity,
-    ServiceType::LightSensor,
+    CharacteristicType::AirParticulateSize,
-    ServiceType::MotionSensor,
-    ServiceType::OccupancySensor,
-    ServiceType::SmokeSensor,
-    ServiceType::TemperatureSensor,
 ];
 
 #[launch]

homekit-exporter/src/server.rs

@@ -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(