Add camera preview auto discovery
This commit is contained in:
3 files changed
+5
-115
No files matched your search
Generated
+1
-7
@@ -1266,12 +1266,6 @@ dependencies = [
|
||||
"wasm-bindgen",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "json"
|
||||
version = "0.12.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd"
|
||||
|
||||
[[package]]
|
||||
name = "lazy_static"
|
||||
version = "1.4.0"
|
||||
@@ -1430,13 +1424,13 @@ dependencies = [
|
||||
"heck",
|
||||
"is_sorted",
|
||||
"itertools",
|
||||
"json",
|
||||
"lazy_static",
|
||||
"log",
|
||||
"neolink_core",
|
||||
"regex",
|
||||
"rumqttc",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"time",
|
||||
"tokio",
|
||||
"tokio-stream",
|
||||
|
||||
+1
-1
@@ -26,13 +26,13 @@ gstreamer-rtsp-server = { version = "0.20.3", features = ["v1_16"] }
|
||||
heck = "0.4.1"
|
||||
is_sorted = "0.1.1"
|
||||
itertools = "0.10.5"
|
||||
json = "0.12.4"
|
||||
lazy_static = "1.4.0"
|
||||
log = { version = "0.4.17", features = [ "release_max_level_debug" ] }
|
||||
neolink_core = { path = "crates/core", version = "0.5.12" }
|
||||
regex = "1.7.3"
|
||||
rumqttc = "0.20.0"
|
||||
serde = { version = "1.0.160", features = ["derive"] }
|
||||
serde_json = "1.0.96"
|
||||
time = "0.3.20"
|
||||
tokio = { version = "1.27.0", features = ["rt-multi-thread", "macros", "io-util", "tracing"] }
|
||||
tokio-stream = "0.1.12"
|
||||
|
||||
+3
-107
@@ -58,22 +58,22 @@ use std::sync::Arc;
|
||||
use tokio::time::{sleep, Duration};
|
||||
|
||||
mod cmdline;
|
||||
mod discovery;
|
||||
mod event_cam;
|
||||
mod mqttc;
|
||||
|
||||
use crate::config::{CameraConfig, Config, MqttConfig, MqttDiscoveryConfig};
|
||||
use crate::config::{CameraConfig, Config, MqttConfig};
|
||||
use anyhow::{anyhow, Context, Error, Result};
|
||||
pub(crate) use cmdline::Opt;
|
||||
use event_cam::EventCam;
|
||||
pub(crate) use event_cam::{Direction, Messages};
|
||||
use heck::ToTitleCase;
|
||||
use json::{array, object, JsonValue};
|
||||
use log::*;
|
||||
use mqttc::{Mqtt, MqttReplyRef};
|
||||
|
||||
use self::{
|
||||
event_cam::EventCamSender,
|
||||
mqttc::{MqttReply, MqttSender},
|
||||
discovery::enable_discovery,
|
||||
};
|
||||
|
||||
/// Entry point for the mqtt subcommand
|
||||
@@ -226,110 +226,6 @@ async fn listen_on_camera(cam_config: Arc<CameraConfig>, mqtt_config: &MqttConfi
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Enables MQTT discovery for a camera. See docs at https://www.home-assistant.io/integrations/mqtt/#mqtt-discovery
|
||||
async fn enable_discovery(
|
||||
discovery_config: &MqttDiscoveryConfig,
|
||||
mqtt_sender: &MqttSender,
|
||||
cam_config: &Arc<CameraConfig>,
|
||||
) -> Result<()> {
|
||||
debug!("Enabling MQTT discovery for {}", cam_config.name);
|
||||
|
||||
let mut connections: JsonValue = array![];
|
||||
if let Some(addr) = &cam_config.camera_addr {
|
||||
connections
|
||||
.push(array!["camera_addr", addr.as_str()])
|
||||
.expect("Failed to add camera_addr to connections");
|
||||
}
|
||||
if let Some(uid) = &cam_config.camera_uid {
|
||||
connections
|
||||
.push(array!["camera_uid", uid.as_str()])
|
||||
.expect("Failed to add camera_uid to connections");
|
||||
}
|
||||
|
||||
if connections.is_empty() {
|
||||
error!(
|
||||
"No connections found for camera {}, either addr or UID must be supplied",
|
||||
cam_config.name
|
||||
);
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
let friendly_name = cam_config.name.replace("_", " ").to_title_case();
|
||||
let device = object! {
|
||||
connections: connections,
|
||||
name: friendly_name.as_str(),
|
||||
identifiers: array![format!("neolink_{}", cam_config.name)],
|
||||
manufacturer: "Reolink",
|
||||
model: "Neolink",
|
||||
sw_version: env!("CARGO_PKG_VERSION"),
|
||||
};
|
||||
|
||||
let availability = object! {
|
||||
topic: format!("neolink/{}/status", cam_config.name),
|
||||
payload_available: "connected",
|
||||
};
|
||||
|
||||
for feature in &discovery_config.features {
|
||||
match feature.as_str() {
|
||||
"floodlight" => {
|
||||
let discovery_prefix = format!("{}/light", discovery_config.topic);
|
||||
|
||||
let config_data = object! {
|
||||
// Common across all potential features
|
||||
device: device.clone(),
|
||||
availability: availability.clone(),
|
||||
|
||||
// Identifiers
|
||||
name: format!("{} Floodlight", friendly_name.as_str()),
|
||||
unique_id: format!("neolink_{}_floodlight", cam_config.name),
|
||||
// Match native home assistant integration: https://github.com/home-assistant/core/blob/dev/homeassistant/components/reolink/light.py#L49
|
||||
icon: "mdi:spotlight-beam",
|
||||
|
||||
// State
|
||||
state_topic: format!("neolink/{}/status/floodlight", cam_config.name),
|
||||
state_value_template: "{{ value_json.state }}",
|
||||
|
||||
// Control
|
||||
command_topic: format!("neolink/{}/control/floodlight", cam_config.name),
|
||||
// Lowercase payloads to match neolink convention
|
||||
payload_on: "on",
|
||||
payload_off: "off",
|
||||
};
|
||||
|
||||
// Each feature needs to be individually registered
|
||||
mqtt_sender
|
||||
.send_message_with_root_topic(
|
||||
&discovery_prefix,
|
||||
"config",
|
||||
&config_data.dump(),
|
||||
true,
|
||||
)
|
||||
.await
|
||||
.with_context(|| {
|
||||
format!(
|
||||
"Failed to publish auto-discover data on over MQTT for {}",
|
||||
cam_config.name
|
||||
)
|
||||
})?;
|
||||
}
|
||||
_ => {
|
||||
error!(
|
||||
"Unsupported MQTT feature {} for {}",
|
||||
feature, cam_config.name
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
info!(
|
||||
"Enabled MQTT discovery for {} with friendly name {}",
|
||||
cam_config.name,
|
||||
friendly_name.as_str()
|
||||
);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn handle_mqtt_message(
|
||||
msg: &MqttReply,
|
||||
event_cam_sender: EventCamSender,
|
||||
|
||||
Reference in new issue
Block a user