Revert the moq_lite changes. (#787)

Author: kixelated

rs/hang/src/catalog/root.rs

@@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::catalog::{Audio, AudioConfig, Chat, Track, User, Video, VideoConfig};
 use crate::Result;
-use moq_lite::Pair;
+use moq_lite::Produce;
 
 /// A catalog track, created by a broadcaster to describe the tracks available in a broadcast.
 #[serde_with::serde_as]
@@ -83,10 +83,10 @@ impl Catalog {
 	}
 
 	/// Produce a catalog track that describes the available media tracks.
-	pub fn produce(self) -> Pair<CatalogProducer, CatalogConsumer> {
+	pub fn produce(self) -> Produce<CatalogProducer, CatalogConsumer> {
 		let track = Catalog::default_track().produce();
 
-		Pair {
+		Produce {
 			producer: CatalogProducer::new(track.producer, self),
 			consumer: track.consumer.into(),
 		}

rs/moq-lite/src/model/broadcast.rs

@@ -7,14 +7,12 @@ use std::{
 	},
 };
 
-use crate::{Error, Pair, TrackConsumer, TrackProducer};
+use crate::{Error, Produce, TrackConsumer, TrackProducer};
 use tokio::sync::watch;
 use web_async::Lock;
 
 use super::Track;
 
-pub type BroadcastPair = Pair<BroadcastProducer, BroadcastConsumer>;
-
 struct State {
 	// When explicitly publishing, we hold a reference to the consumer.
 	// This prevents the track from being marked as "unused".
@@ -31,10 +29,10 @@ pub struct Broadcast {
 }
 
 impl Broadcast {
-	pub fn produce() -> BroadcastPair {
+	pub fn produce() -> Produce<BroadcastProducer, BroadcastConsumer> {
 		let producer = BroadcastProducer::new();
 		let consumer = producer.consume();
-		BroadcastPair { producer, consumer }
+		Produce { producer, consumer }
 	}
 }
 

rs/moq-lite/src/model/frame.rs

@@ -3,9 +3,7 @@ use std::future::Future;
 use bytes::{Bytes, BytesMut};
 use tokio::sync::watch;
 
-use crate::{Error, Pair, Result};
-
-pub type FramePair = Pair<FrameProducer, FrameConsumer>;
+use crate::{Error, Produce, Result};
 
 #[derive(Clone, Debug)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
@@ -14,10 +12,10 @@ pub struct Frame {
 }
 
 impl Frame {
-	pub fn produce(self) -> FramePair {
+	pub fn produce(self) -> Produce<FrameProducer, FrameConsumer> {
 		let producer = FrameProducer::new(self);
 		let consumer = producer.consume();
-		FramePair { producer, consumer }
+		Produce { producer, consumer }
 	}
 }
 

rs/moq-lite/src/model/group.rs

@@ -12,23 +12,21 @@ use std::future::Future;
 use bytes::Bytes;
 use tokio::sync::watch;
 
-use crate::{Error, Pair, Result};
+use crate::{Error, Produce, Result};
 
 use super::{Frame, FrameConsumer, FrameProducer};
 
-pub type GroupPair = Pair<GroupProducer, GroupConsumer>;
-
 #[derive(Clone, Debug, Hash, Eq, PartialEq, Ord, PartialOrd)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct Group {
 	pub sequence: u64,
 }
 
 impl Group {
-	pub fn produce(self) -> GroupPair {
+	pub fn produce(self) -> Produce<GroupProducer, GroupConsumer> {
 		let producer = GroupProducer::new(self);
 		let consumer = producer.consume();
-		GroupPair { producer, consumer }
+		Produce { producer, consumer }
 	}
 }
 

rs/moq-lite/src/model/mod.rs

@@ -2,12 +2,12 @@ mod broadcast;
 mod frame;
 mod group;
 mod origin;
-mod pair;
+mod produce;
 mod track;
 
 pub use broadcast::*;
 pub use frame::*;
 pub use group::*;
 pub use origin::*;
-pub use pair::*;
+pub use produce::*;
 pub use track::*;

rs/moq-lite/src/model/origin.rs

@@ -6,12 +6,10 @@ use tokio::sync::mpsc;
 use web_async::Lock;
 
 use super::BroadcastConsumer;
-use crate::{AsPath, Pair, Path, PathOwned};
+use crate::{AsPath, Path, PathOwned, Produce};
 
 static NEXT_CONSUMER_ID: AtomicU64 = AtomicU64::new(0);
 
-pub type OriginPair = Pair<OriginProducer, OriginConsumer>;
-
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 struct ConsumerId(u64);
 
@@ -339,10 +337,10 @@ pub type OriginAnnounce = (PathOwned, Option<BroadcastConsumer>);
 pub struct Origin {}
 
 impl Origin {
-	pub fn produce() -> OriginPair {
+	pub fn produce() -> Produce<OriginProducer, OriginConsumer> {
 		let producer = OriginProducer::default();
 		let consumer = producer.consume();
-		OriginPair { producer, consumer }
+		Produce { producer, consumer }
 	}
 }
 

rs/moq-lite/src/model/pair.rs rs/moq-lite/src/model/produce.rsrs/moq-lite/src/model/pair.rs renamed to rs/moq-lite/src/model/produce.rs

@@ -4,7 +4,7 @@
 /// However when the number of references reaches zero, the other will receive a signal to close.
 /// A new consumer may be created at any time by calling [T::consume].
 #[derive(Clone)]
-pub struct Pair<P, C> {
+pub struct Produce<P, C> {
 	pub producer: P,
 	pub consumer: C,
 }

rs/moq-lite/src/model/track.rs

@@ -14,14 +14,12 @@
 
 use tokio::sync::watch;
 
-use crate::{Error, Pair, Result};
+use crate::{Error, Produce, Result};
 
 use super::{Group, GroupConsumer, GroupProducer};
 
 use std::{cmp::Ordering, future::Future};
 
-pub type TrackPair = Pair<TrackProducer, TrackConsumer>;
-
 #[derive(Clone, Debug, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct Track {
@@ -37,10 +35,10 @@ impl Track {
 		}
 	}
 
-	pub fn produce(self) -> TrackPair {
+	pub fn produce(self) -> Produce<TrackProducer, TrackConsumer> {
 		let producer = TrackProducer::new(self);
 		let consumer = producer.consume();
-		TrackPair { producer, consumer }
+		Produce { producer, consumer }
 	}
 }
 

rs/moq-relay/src/cluster.rs

@@ -57,16 +57,16 @@ pub struct Cluster {
 	client: moq_native::Client,
 
 	// Advertises ourselves as an origin to other nodes.
-	noop: moq_lite::Pair<BroadcastProducer, BroadcastConsumer>,
+	noop: moq_lite::Produce<BroadcastProducer, BroadcastConsumer>,
 
 	// Broadcasts announced by local clients (users).
-	pub primary: Arc<moq_lite::Pair<OriginProducer, OriginConsumer>>,
+	pub primary: Arc<moq_lite::Produce<OriginProducer, OriginConsumer>>,
 
 	// Broadcasts announced by remote servers (cluster).
-	pub secondary: Arc<moq_lite::Pair<OriginProducer, OriginConsumer>>,
+	pub secondary: Arc<moq_lite::Produce<OriginProducer, OriginConsumer>>,
 
 	// Broadcasts announced by local clients and remote servers.
-	pub combined: Arc<moq_lite::Pair<OriginProducer, OriginConsumer>>,
+	pub combined: Arc<moq_lite::Produce<OriginProducer, OriginConsumer>>,
 }
 
 impl Cluster {