Merge pull request #30 from piotrpdev/OKO-106-Automatic-Camera-Detection

Author: piotrpdev

README.md

@@ -62,6 +62,7 @@ Made using the following resources:
 | [gatekeeper source code][gatekeeper]      | [Unlicense][gatekeeper-license]   |
 | [`esp-camera-rs` package fork][cam-rs]    | [MIT][cam-rs-license]             |
 | [Geist font][geist]                       | [OFL-1.1][geist-license]          |
+|[`mdns` examples][mdns]                    | [MIT][mdns-license]               |
 
 [^1]: [*"...this solution can be customized to suit your particular requirements.
 Don’t hesitate to make adjustments and employ this code according to your
@@ -116,5 +117,7 @@ video-to-image conversion needs."*][video2image-medium]
 [cam-rs-license]: https://github.com/hnz1102/esp-camera-rs/blob/main/LICENSE
 [geist]: https://github.com/vercel/geist-font
 [geist-license]: https://github.com/vercel/geist-font/blob/main/OFL.txt
+[mdns]: https://github.com/dylanmckay/mdns/tree/master/examples
+[mdns-license]: https://github.com/dylanmckay/mdns/blob/master/LICENSE
 
 <!-- https://eslint.org/docs/latest/use/configure/language-options -->

backend/Cargo.lock

@@ -41,6 +41,9 @@ tokio-util = { version = "0.7.12", features = ["rt"] }
 axum-embed = "0.1.0"
 rust-embed = "8.5.0"
 serde_bytes = "0.11.15"
+mdns = { git = "https://github.com/PhysicalGraph/mdns.git", rev = "6de7b76434f3fc4f5702322b995ac66963b2c60f" } # This fork adds back tokio support
+tokio-stream = { version = "0.1.17", features = ["sync"] }
+async-stream = "0.3.6"
 
 [dev-dependencies]
 playwright = { version = "0.0.20", default-features = false, features = ["rt-tokio"] }

backend/Cargo.toml

@@ -1,3 +1,5 @@
+use futures_util::{Stream, StreamExt};
+use tokio_util::sync::CancellationToken;
 use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
 
 pub use crate::web::{ApiChannelMessage, App, ImageContainer};
@@ -12,6 +14,33 @@ pub use {
     db::VideoCameraView,
 };
 
+// Taken from https://github.com/hyperium/hyper/issues/2787#issuecomment-1073229886
+/// Run a stream until it completes or we receive the shutdown signal.
+///
+/// Uses the `async-stream` to make things easier to write.
+pub fn or_until_shutdown<S>(
+    stream: S,
+    shutdown_token: CancellationToken,
+) -> impl Stream<Item = S::Item>
+where
+    S: Stream,
+{
+    async_stream::stream! {
+        futures_util::pin_mut!(stream);
+
+        loop {
+            tokio::select! {
+                Some(item) = stream.next() => {
+                    yield item
+                }
+                () = shutdown_token.cancelled() => {
+                    break;
+                }
+            }
+        }
+    }
+}
+
 pub async fn run() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     // TODO: Improve this, log to file, etc.
     // TODO: Use tracing wherever '?' is used.

backend/src/lib.rs

@@ -1,4 +1,5 @@
 pub use app::App;
+pub use app::AppState;
 pub use app::ImageContainer;
 use serde::Deserialize;
 use serde::Serialize;
@@ -21,6 +22,12 @@ pub enum ApiChannelMessage {
     Initial,
 }
 
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub enum MdnsChannelMessage {
+    ServiceDiscovered { mdns_response: mdns::Response },
+    Initial,
+}
+
 mod app;
 mod auth;
 mod protected;