feat: iroh support

Cargo.toml

@@ -21,6 +21,7 @@ moq-token = { version = "0.5", path = "rs/moq-token" }
 serde = { version = "1", features = ["derive"] }
 tokio = "1.48"
 web-async = { version = "0.1.1", features = ["tracing"] }
+web-transport-iroh = "0.1.1"
 web-transport-quinn = "0.10"
 web-transport-trait = "0.3"
 web-transport-ws = "0.2"

README.md

@@ -164,6 +164,45 @@ just web      # Terminal 3: Start web server
 
 There are more commands: check out the [justfile](justfile), [rs/justfile](rs/justfile), and [js/justfile](js/justfile).
 
+## Iroh support
+
+The `moq-native` and `moq-relay` crates optionally support connecting via [iroh](https://github.com/n0-computer/iroh). The iroh integration is disabled by default, to use it enable the `iroh` feature.
+
+When the iroh feature is enabled, you can connect to iroh endpoints with these URLs:
+
+* `iroh://<ENDPOINT_ID>`: Connect via moq-lite over raw QUIC.
+* `moql+iroh://<ENDPOINT_ID>`: Connect via moq-lite over raw QUIC (same as above)
+* `moqt+iroh://<ENDPOINT_ID>`: Connect via IETF MoQ over raw QUIC
+* `h3+iroh://<ENDPOINT_ID>/optional/path?with=query`: Connect via WebTransport over HTTP/3.
+
+`ENDPOINT_ID` must be the hex-encoded iroh endpoint id. It is currently not possible to set direct addresses or iroh relay URLs. The iroh integration in moq-native uses iroh's default discovery mechanisms to discover other endpoints by their endpoint id.
+
+You can run a demo like this:
+
+```sh
+# Terminal 1: Start a relay server
+just relay --iroh-enabled
+# Copy the endpoint id printed at "iroh listening"
+
+# Terminal 2: Publish via moq-lite over raw iroh QUIC
+#
+# Replace ENDPOINT_ID with the relay's endpoint id.
+#
+# We set an `anon/` prefix to match the broadcast name the web ui expects
+# Because moq-lite does not have headers if using raw QUIC, only the hostname
+# in the URL can be used.
+just pub-iroh bbb iroh://ENDPOINT_ID anon/
+# Alternatively you can use WebTransport over HTTP/3 over iroh,
+# which allows to set a path prefix in the URL:
+just pub-iroh bbb h3+iroh://ENDPOINT_ID/anon
+
+# Terminal 3: Start web server
+just web
+```
+
+Then open [localhost:5173](http://localhost:5173) and watch BBB, pushed from terminal 1 via iroh to the relay running in terminal 2, from where the browser fetches it over regular WebTransport.
+
+`just serve` serves a video via iroh alongside regular QUIC (it enables the `iroh` feature). This repo currently does not provide a native viewer, so you can't subscribe to it directly. However, you can use the [watch example from iroh-live](https://github.com/n0-computer/iroh-live/blob/main/iroh-live/examples/watch.rs) to view a video published via `hang-native`.
 
 ## License
 

dev/relay.toml

@@ -25,3 +25,14 @@ listen = "[::]:4443"
 [auth]
 # Allow anonymous access to everything.
 public = ""
+
+[iroh]
+# You can optionally enable iroh support for P2P connections.
+# Clients can connect using --iroh-enabled and a `iroh://` URL.
+enabled = false
+
+# Path to persist the iroh secret key.
+# If the file does not exist, a random key will be generated and written to the path.
+# This gives the relay a persistent iroh endpoint id. The secret key can alternatively be set
+# via MOQ_IROH_SECRET environment variable.
+secret = "./dev/relay-iroh-secret.key"

justfile

@@ -31,10 +31,11 @@ dev:
 		"sleep 1 && just pub bbb http://localhost:4443/anon" \
 		"sleep 2 && just web http://localhost:4443/anon"
 
+
 # Run a localhost relay server without authentication.
-relay:
+relay *args:
 	# Run the relay server overriding the provided configuration file.
-	TOKIO_CONSOLE_BIND=127.0.0.1:6680 cargo run --bin moq-relay -- dev/relay.toml
+	TOKIO_CONSOLE_BIND=127.0.0.1:6680 cargo run --bin moq-relay -- dev/relay.toml {{args}}
 
 # Run a cluster of relay servers
 cluster:
@@ -128,23 +129,38 @@ download-url name:
 		*) echo "unknown" && exit 1 ;; \
 	esac
 
+# Convert an h264 input file to CMAF (fmp4) format to stdout.
+ffmpeg-cmaf input output='-' *args:
+	ffmpeg -hide_banner -v quiet \
+		-stream_loop -1 -re \
+		-i "{{input}}" \
+		-c copy \
+		-f mp4 -movflags cmaf+separate_moof+delay_moov+skip_trailer+frag_every_frame {{args}} {{output}}
+
 # Publish a video using ffmpeg to the localhost relay server
 # NOTE: The `http` means that we perform insecure certificate verification.
 # Switch it to `https` when you're ready to use a real certificate.
-pub name url="http://localhost:4443/anon" *args:
+pub name url="http://localhost:4443/anon" prefix="" *args:
 	# Download the sample media.
 	just download "{{name}}"
-
 	# Pre-build the binary so we don't queue media while compiling.
 	cargo build --bin hang
+	# Publish the media with the hang cli.
+	just ffmpeg-cmaf "dev/{{name}}.fmp4" |\
+	cargo run --bin hang -- \
+		publish --url "{{url}}" --name "{{prefix}}{{name}}" fmp4 {{args}}
 
-	# Run ffmpeg and pipe the output to hang
-	ffmpeg -hide_banner -v quiet \
-		-stream_loop -1 -re \
-		-i "dev/{{name}}.fmp4" \
-		-c copy \
-		-f mp4 -movflags cmaf+separate_moof+delay_moov+skip_trailer+frag_every_frame \
-		- | TOKIO_CONSOLE_BIND=127.0.0.1:6681 cargo run --bin hang -- publish --url "{{url}}" --name "{{name}}" fmp4 {{args}}
+# Publish a video using ffmpeg to the localhost relay server
+# Enables iroh support so you can use an iroh:// URL of the relay
+pub-iroh name url="http://localhost:4443/anon" prefix="" *args:
+	# Download the sample media.
+	just download "{{name}}"
+	# Pre-build the binary so we don't queue media while compiling.
+	cargo build --bin hang
+	# Publish the media with the hang cli.
+	just ffmpeg-cmaf "dev/{{name}}.fmp4" |\
+	cargo run --bin hang -- \
+		--iroh-enabled publish --url "{{url}}" --name "{{prefix}}{{name}}" fmp4 {{args}}
 
 # Generate and ingest an HLS stream from a video file.
 pub-hls name relay="http://localhost:4443/anon":
@@ -241,20 +257,19 @@ sub name url='http://localhost:4443/anon':
 	@echo "Install and use hang-gst directly for GStreamer functionality"
 
 # Publish a video using ffmpeg directly from hang to the localhost
-serve name:
+# To also serve via iroh, pass --iroh-enabled as last argument.
+serve name *args:
 	# Download the sample media.
 	just download "{{name}}"
 
 	# Pre-build the binary so we don't queue media while compiling.
 	cargo build --bin hang
 
 	# Run ffmpeg and pipe the output to hang
-	ffmpeg -hide_banner -v quiet \
-		-stream_loop -1 -re \
-		-i "dev/{{name}}.fmp4" \
-		-c copy \
-		-f mp4 -movflags cmaf+separate_moof+delay_moov+skip_trailer+frag_every_frame \
-		- | cargo run --bin hang -- serve --listen "[::]:4443" --tls-generate "localhost" --name "{{name}}"
+	just ffmpeg-cmaf "dev/{{name}}.fmp4" |\
+	cargo run --bin hang -- \
+		{{args}} serve --listen "[::]:4443" --tls-generate "localhost" \
+		--name "{{name}}" fmp4
 
 # Run the web server
 web url='http://localhost:4443/anon':

rs/hang-cli/Cargo.toml

@@ -14,6 +14,10 @@ categories = ["multimedia", "network-programming", "web-programming"]
 [[bin]]
 name = "hang"
 path = "src/main.rs"
+
+[features]
+default = ["iroh"]
+iroh = ["moq-native/iroh"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

rs/hang-cli/src/client.rs

@@ -3,9 +3,7 @@ use crate::Publish;
 use hang::moq_lite;
 use url::Url;
 
-pub async fn client(config: moq_native::ClientConfig, url: Url, name: String, publish: Publish) -> anyhow::Result<()> {
-	let client = config.init()?;
-
+pub async fn run_client(client: moq_native::Client, url: Url, name: String, publish: Publish) -> anyhow::Result<()> {
 	// Create an origin producer to publish to the broadcast.
 	let origin = moq_lite::Origin::produce();
 	origin.producer.publish_broadcast(&name, publish.consume());

rs/hang-cli/src/main.rs

@@ -1,10 +1,12 @@
 mod client;
 mod publish;
 mod server;
+mod web;
 
 use client::*;
 use publish::*;
 use server::*;
+use web::*;
 
 use clap::{Parser, Subcommand};
 use std::path::PathBuf;
@@ -15,6 +17,11 @@ pub struct Cli {
 	#[command(flatten)]
 	log: moq_native::Log,
 
+	/// Iroh configuration
+	#[command(flatten)]
+	#[cfg(feature = "iroh")]
+	iroh: moq_native::iroh::EndpointConfig,
+
 	#[command(subcommand)]
 	command: Command,
 }
@@ -84,8 +91,34 @@ async fn main() -> anyhow::Result<()> {
 	// Initialize the broadcast from stdin before starting any client/server.
 	publish.init().await?;
 
+	#[cfg(feature = "iroh")]
+	let iroh = cli.iroh.bind().await?;
+
 	match cli.command {
-		Command::Serve { config, dir, name, .. } => server(config, name, dir, publish).await,
-		Command::Publish { config, url, name, .. } => client(config, url, name, publish).await,
+		Command::Serve { config, dir, name, .. } => {
+			let web_bind = config.bind.unwrap_or("[::]:443".parse().unwrap());
+
+			#[allow(unused_mut)]
+			let mut server = config.init()?;
+			#[cfg(feature = "iroh")]
+			server.with_iroh(iroh);
+
+			let web_tls = server.tls_info();
+
+			tokio::select! {
+				res = run_server(server, name, publish.consume()) => res,
+				res = run_web(web_bind, web_tls, dir) => res,
+				res = publish.run() => res,
+			}
+		}
+		Command::Publish { config, url, name, .. } => {
+			#[allow(unused_mut)]
+			let mut client = config.init()?;
+
+			#[cfg(feature = "iroh")]
+			client.with_iroh(iroh);
+
+			run_client(client, url, name, publish).await
+		}
 	}
 }

rs/hang-cli/src/server.rs

@@ -1,50 +1,14 @@
-use anyhow::Context;
-use axum::handler::HandlerWithoutStateExt;
-use axum::http::StatusCode;
-use axum::response::IntoResponse;
-use axum::{http::Method, routing::get, Router};
 use hang::moq_lite;
-use std::net::SocketAddr;
-use std::path::PathBuf;
-use std::sync::{Arc, RwLock};
-use tower_http::cors::{Any, CorsLayer};
-use tower_http::services::ServeDir;
 
-use crate::Publish;
-
-pub async fn server(
-	config: moq_native::ServerConfig,
+pub async fn run_server(
+	mut server: moq_native::Server,
 	name: String,
-	public: Option<PathBuf>,
-	publish: Publish,
+	consumer: moq_lite::BroadcastConsumer,
 ) -> anyhow::Result<()> {
-	let mut listen = config.bind.unwrap_or("[::]:443".parse().unwrap());
-	listen = tokio::net::lookup_host(listen)
-		.await
-		.context("invalid listen address")?
-		.next()
-		.context("invalid listen address")?;
-
-	let server = config.init()?;
-
 	#[cfg(unix)]
 	// Notify systemd that we're ready.
 	let _ = sd_notify::notify(true, &[sd_notify::NotifyState::Ready]);
 
-	let tls_info = server.tls_info();
-
-	tokio::select! {
-		res = accept(server, name, publish.consume()) => res,
-		res = publish.run() => res,
-		res = web(listen, tls_info, public) => res,
-	}
-}
-
-async fn accept(
-	mut server: moq_native::Server,
-	name: String,
-	consumer: moq_lite::BroadcastConsumer,
-) -> anyhow::Result<()> {
 	let mut conn_id = 0;
 
 	tracing::info!(addr = ?server.local_addr(), "listening");
@@ -85,46 +49,3 @@ async fn run_session(
 
 	session.closed().await.map_err(Into::into)
 }
-
-// Initialize the HTTP server (but don't serve yet).
-async fn web(
-	bind: SocketAddr,
-	tls_info: Arc<RwLock<moq_native::TlsInfo>>,
-	public: Option<PathBuf>,
-) -> anyhow::Result<()> {
-	async fn handle_404() -> impl IntoResponse {
-		(StatusCode::NOT_FOUND, "Not found")
-	}
-
-	let fingerprint_handler = move || async move {
-		// Get the first certificate's fingerprint.
-		// TODO serve all of them so we can support multiple signature algorithms.
-		tls_info
-			.read()
-			.expect("tls_info read lock poisoned")
-			.fingerprints
-			.first()
-			.expect("missing certificate")
-			.clone()
-	};
-
-	let mut app = Router::new()
-		.route("/certificate.sha256", get(fingerprint_handler))
-		.layer(CorsLayer::new().allow_origin(Any).allow_methods([Method::GET]));
-
-	// If a public directory is provided, serve it.
-	// We use this for local development to serve the index.html file and friends.
-	if let Some(public) = public.as_ref() {
-		tracing::info!(public = %public.display(), "serving directory");
-
-		let public = ServeDir::new(public).not_found_service(handle_404.into_service());
-		app = app.fallback_service(public);
-	} else {
-		app = app.fallback_service(handle_404.into_service());
-	}
-
-	let server = axum_server::bind(bind);
-	server.serve(app.into_make_service()).await?;
-
-	Ok(())
-}