Merge pull request #1 from englishm/draft-ietf-moq-transport-05

moq-transport draft-05 initial wire format updates
englishm · Oct 22, 2024 · 9ca7e1e · 9ca7e1e
2 parents 09f6e0a + 7ac2ff9
commit 9ca7e1e
Show file tree

Hide file tree

Showing 54 changed files with 183 additions and 98 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,13 +1,13 @@
 [workspace]
 members = [
 	"moq-transport",
-	"moq-relay",
+	"moq-relay-ietf",
 	"moq-pub",
 	"moq-sub",
 	"moq-api",
-	"moq-clock",
+	"moq-clock-ietf",
 	"moq-dir",
-	"moq-native",
+	"moq-native-ietf",
 	"moq-catalog",
 ]
 resolver = "2"

diff --git a/moq-clock/CHANGELOG.md → moq-clock-ietf/CHANGELOG.md b/moq-clock/CHANGELOG.md → moq-clock-ietf/CHANGELOG.md
diff --git a/moq-clock/Cargo.toml → moq-clock-ietf/Cargo.toml b/moq-clock/Cargo.toml → moq-clock-ietf/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
-name = "moq-clock"
+name = "moq-clock-ietf"
 description = "CLOCK over QUIC"
 authors = ["Luke Curley"]
 repository = "https://github.com/kixelated/moq-rs"
 license = "MIT OR Apache-2.0"
 
-version = "0.5.1"
+version = "0.6.0"
 edition = "2021"
 
 keywords = ["quic", "http3", "webtransport", "media", "live"]
@@ -14,8 +14,8 @@ categories = ["multimedia", "network-programming", "web-programming"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-moq-native = { path = "../moq-native", version = "0.4" }
-moq-transport = { path = "../moq-transport", version = "0.6" }
+moq-native-ietf = { path = "../moq-native-ietf", version = "0.5" }
+moq-transport = { path = "../moq-transport", version = "0.7" }
 
 # QUIC
 url = "2"

diff --git a/moq-clock/src/cli.rs → moq-clock-ietf/src/cli.rs b/moq-clock/src/cli.rs → moq-clock-ietf/src/cli.rs
diff --git a/moq-clock/src/clock.rs → moq-clock-ietf/src/clock.rs b/moq-clock/src/clock.rs → moq-clock-ietf/src/clock.rs
diff --git a/moq-clock/src/main.rs → moq-clock-ietf/src/main.rs b/moq-clock/src/main.rs → moq-clock-ietf/src/main.rs
@@ -1,4 +1,4 @@
-use moq_native::quic;
+use moq_native_ietf::quic;
 use std::net;
 use url::Url;
 
@@ -24,7 +24,7 @@ pub struct Cli {
 
 	/// The TLS configuration.
 	#[command(flatten)]
-	pub tls: moq_native::tls::Args,
+	pub tls: moq_native_ietf::tls::Args,
 
 	/// Publish the current time to the relay, otherwise only subscribe.
 	#[arg(long)]

diff --git a/moq-dir/Cargo.toml b/moq-dir/Cargo.toml
@@ -5,15 +5,15 @@ authors = ["Luke Curley"]
 repository = "https://github.com/kixelated/moq-rs"
 license = "MIT OR Apache-2.0"
 
-version = "0.2.1"
+version = "0.3.0"
 edition = "2021"
 
 keywords = ["quic", "http3", "webtransport", "media", "live"]
 categories = ["multimedia", "network-programming", "web-programming"]
 
 [dependencies]
-moq-native = { path = "../moq-native", version = "0.4" }
-moq-transport = { path = "../moq-transport", version = "0.6" }
+moq-native-ietf = { path = "../moq-native-ietf", version = "0.5" }
+moq-transport = { path = "../moq-transport", version = "0.7" }
 
 # QUIC
 web-transport = { workspace = true }

diff --git a/moq-dir/src/listing.rs b/moq-dir/src/listing.rs
@@ -66,7 +66,7 @@ impl ListingWriter {
 			None => self.track.take().unwrap().groups()?,
 		};
 
-		let priority = self.group.as_ref().map(|g| g.group_id + 1).unwrap_or(0);
+		let priority = 127;
 		let mut group = groups.append(priority)?;
 
 		let mut msg = BytesMut::new();

diff --git a/moq-dir/src/main.rs b/moq-dir/src/main.rs
@@ -4,7 +4,7 @@ use futures::{stream::FuturesUnordered, StreamExt};
 
 use std::net;
 
-use moq_native::{quic, tls};
+use moq_native_ietf::{quic, tls};
 
 mod listing;
 mod listings;

diff --git a/moq-native/CHANGELOG.md → moq-native-ietf/CHANGELOG.md b/moq-native/CHANGELOG.md → moq-native-ietf/CHANGELOG.md
diff --git a/moq-native/Cargo.toml → moq-native-ietf/Cargo.toml b/moq-native/Cargo.toml → moq-native-ietf/Cargo.toml
@@ -1,18 +1,18 @@
 [package]
-name = "moq-native"
+name = "moq-native-ietf"
 description = "Media over QUIC - Helper library for native applications"
 authors = ["Luke Curley"]
 repository = "https://github.com/kixelated/moq-rs"
 license = "MIT OR Apache-2.0"
 
-version = "0.4.0"
+version = "0.5.0"
 edition = "2021"
 
 keywords = ["quic", "http3", "webtransport", "media", "live"]
 categories = ["multimedia", "network-programming", "web-programming"]
 
 [dependencies]
-moq-transport = { path = "../moq-transport", version = "0.6" }
+moq-transport = { path = "../moq-transport", version = "0.7" }
 web-transport = { workspace = true }
 web-transport-quinn = "0.3"
 

diff --git a/moq-native/src/lib.rs → moq-native-ietf/src/lib.rs b/moq-native/src/lib.rs → moq-native-ietf/src/lib.rs
diff --git a/moq-native/src/quic.rs → moq-native-ietf/src/quic.rs b/moq-native/src/quic.rs → moq-native-ietf/src/quic.rs
diff --git a/moq-native/src/tls.rs → moq-native-ietf/src/tls.rs b/moq-native/src/tls.rs → moq-native-ietf/src/tls.rs
diff --git a/moq-pub/Cargo.toml b/moq-pub/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Mike English", "Luke Curley"]
 repository = "https://github.com/kixelated/moq-rs"
 license = "MIT OR Apache-2.0"
 
-version = "0.7.1"
+version = "0.8.0"
 edition = "2021"
 
 keywords = ["quic", "http3", "webtransport", "media", "live"]
@@ -14,8 +14,8 @@ categories = ["multimedia", "network-programming", "web-programming"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-moq-native = { path = "../moq-native", version = "0.4" }
-moq-transport = { path = "../moq-transport", version = "0.6" }
+moq-native-ietf = { path = "../moq-native-ietf", version = "0.5" }
+moq-transport = { path = "../moq-transport", version = "0.7" }
 moq-catalog = { path = "../moq-catalog", version = "0.2" }
 
 url = "2"

diff --git a/moq-pub/src/main.rs b/moq-pub/src/main.rs
@@ -6,7 +6,7 @@ use anyhow::Context;
 use clap::Parser;
 use tokio::io::AsyncReadExt;
 
-use moq_native::quic;
+use moq_native_ietf::quic;
 use moq_pub::Media;
 use moq_transport::{serve, session::Publisher};
 
@@ -36,7 +36,7 @@ pub struct Cli {
 
 	/// The TLS configuration.
 	#[command(flatten)]
-	pub tls: moq_native::tls::Args,
+	pub tls: moq_native_ietf::tls::Args,
 }
 
 #[tokio::main]
@@ -56,7 +56,7 @@ async fn main() -> anyhow::Result<()> {
 
 	let tls = cli.tls.load()?;
 
-	let quic = quic::Endpoint::new(moq_native::quic::Config {
+	let quic = quic::Endpoint::new(moq_native_ietf::quic::Config {
 		bind: cli.bind,
 		tls: tls.clone(),
 	})?;

diff --git a/moq-pub/src/media.rs b/moq-pub/src/media.rs
@@ -328,15 +328,15 @@ impl Track {
 
 		// Otherwise make a new segment
 
-		// Compute the timestamp in milliseconds.
-		// Overflows after 583 million years, so we're fine.
-		let timestamp: u32 = fragment
+		let _timestamp: u32 = fragment
 			.timestamp(self.timescale)
 			.as_millis()
 			.try_into()
 			.context("timestamp too large")?;
-
-		let priority = u32::MAX.checked_sub(timestamp).context("priority too large")?.into();
+		// Prioritize each group equally for now
+		// (A u8 doesn't give us granularity for ms since epoch)
+		// TODO: Revisit post draft-05 prioritization
+		let priority: u8 = 127;
 
 		// Create a new segment.
 		let mut segment = self.track.append(priority)?;

diff --git a/moq-relay/CHANGELOG.md → moq-relay-ietf/CHANGELOG.md b/moq-relay/CHANGELOG.md → moq-relay-ietf/CHANGELOG.md
diff --git a/moq-relay/Cargo.toml → moq-relay-ietf/Cargo.toml b/moq-relay/Cargo.toml → moq-relay-ietf/Cargo.toml
@@ -1,19 +1,19 @@
 [package]
-name = "moq-relay"
+name = "moq-relay-ietf"
 description = "Media over QUIC"
 authors = ["Luke Curley"]
 repository = "https://github.com/kixelated/moq-rs"
 license = "MIT OR Apache-2.0"
 
-version = "0.6.1"
+version = "0.7.0"
 edition = "2021"
 
 keywords = ["quic", "http3", "webtransport", "media", "live"]
 categories = ["multimedia", "network-programming", "web-programming"]
 
 [dependencies]
-moq-transport = { path = "../moq-transport", version = "0.6" }
-moq-native = { path = "../moq-native", version = "0.4" }
+moq-transport = { path = "../moq-transport", version = "0.7" }
+moq-native-ietf = { path = "../moq-native-ietf", version = "0.5" }
 moq-api = { path = "../moq-api", version = "0.2" }
 
 # QUIC

diff --git a/moq-relay/README.md → moq-relay-ietf/README.md b/moq-relay/README.md → moq-relay-ietf/README.md
diff --git a/moq-relay/src/api.rs → moq-relay-ietf/src/api.rs b/moq-relay/src/api.rs → moq-relay-ietf/src/api.rs
diff --git a/moq-relay/src/consumer.rs → moq-relay-ietf/src/consumer.rs b/moq-relay/src/consumer.rs → moq-relay-ietf/src/consumer.rs
diff --git a/moq-relay/src/local.rs → moq-relay-ietf/src/local.rs b/moq-relay/src/local.rs → moq-relay-ietf/src/local.rs
diff --git a/moq-relay/src/main.rs → moq-relay-ietf/src/main.rs b/moq-relay/src/main.rs → moq-relay-ietf/src/main.rs
@@ -29,7 +29,7 @@ pub struct Cli {
 
 	/// The TLS configuration.
 	#[command(flatten)]
-	pub tls: moq_native::tls::Args,
+	pub tls: moq_native_ietf::tls::Args,
 
 	/// Forward all announces to the provided server for authentication/routing.
 	/// If not provided, the relay accepts every unique announce.

diff --git a/moq-relay/src/producer.rs → moq-relay-ietf/src/producer.rs b/moq-relay/src/producer.rs → moq-relay-ietf/src/producer.rs
diff --git a/moq-relay/src/relay.rs → moq-relay-ietf/src/relay.rs b/moq-relay/src/relay.rs → moq-relay-ietf/src/relay.rs
@@ -3,7 +3,7 @@ use std::net;
 use anyhow::Context;
 
 use futures::{stream::FuturesUnordered, FutureExt, StreamExt};
-use moq_native::quic;
+use moq_native_ietf::quic;
 use url::Url;
 
 use crate::{Api, Consumer, Locals, Producer, Remotes, RemotesConsumer, RemotesProducer, Session};
@@ -13,7 +13,7 @@ pub struct RelayConfig {
 	pub bind: net::SocketAddr,
 
 	/// The TLS configuration.
-	pub tls: moq_native::tls::Config,
+	pub tls: moq_native_ietf::tls::Config,
 
 	/// Forward all announcements to the (optional) URL.
 	pub announce: Option<Url>,

diff --git a/moq-relay/src/remote.rs → moq-relay-ietf/src/remote.rs b/moq-relay/src/remote.rs → moq-relay-ietf/src/remote.rs
@@ -9,7 +9,7 @@ use std::sync::Weak;
 use futures::stream::FuturesUnordered;
 use futures::FutureExt;
 use futures::StreamExt;
-use moq_native::quic;
+use moq_native_ietf::quic;
 use moq_transport::serve::{Track, TrackReader, TrackWriter};
 use moq_transport::watch::State;
 use url::Url;

diff --git a/moq-relay/src/session.rs → moq-relay-ietf/src/session.rs b/moq-relay/src/session.rs → moq-relay-ietf/src/session.rs
diff --git a/moq-relay/src/tls.rs → moq-relay-ietf/src/tls.rs b/moq-relay/src/tls.rs → moq-relay-ietf/src/tls.rs
diff --git a/moq-relay/src/web.rs → moq-relay-ietf/src/web.rs b/moq-relay/src/web.rs → moq-relay-ietf/src/web.rs
@@ -6,7 +6,7 @@ use tower_http::cors::{Any, CorsLayer};
 
 pub struct WebConfig {
 	pub bind: net::SocketAddr,
-	pub tls: moq_native::tls::Config,
+	pub tls: moq_native_ietf::tls::Config,
 }
 
 // Run a HTTP server using Axum

diff --git a/moq-sub/Cargo.toml b/moq-sub/Cargo.toml
@@ -5,7 +5,7 @@ authors = []
 repository = "https://github.com/kixelated/moq-rs"
 license = "MIT OR Apache-2.0"
 
-version = "0.2.1"
+version = "0.3.0"
 edition = "2021"
 
 keywords = ["quic", "http3", "webtransport", "media", "live"]
@@ -14,8 +14,8 @@ categories = ["multimedia", "network-programming", "web-programming"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-moq-transport = { path = "../moq-transport", version = "0.6" }
-moq-native = { path = "../moq-native", version = "0.4" }
+moq-transport = { path = "../moq-transport", version = "0.7" }
+moq-native-ietf = { path = "../moq-native-ietf", version = "0.5" }
 url = "2"
 
 # Async stuff