Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ hyper-util = { version = "0.1.21", features = ["tokio"] }
if-addrs = "0.15"
indexmap = "2.14.2"
io-uring = "0.7.15"
jni = "0.22"
jsonwebtoken = "11"
kio = { version = "0.6.2", path = "rs/kio" }
kio-macros = { version = "0.1.0", path = "rs/kio/macros" }
Expand Down Expand Up @@ -234,6 +235,7 @@ thiserror = "2"
time = "0.3"
tokio = "1.48"
tokio-rustls = { version = "0.26", default-features = false }
tokio-tungstenite = { version = "0.30", default-features = false }
tokio-util = "0.7"
toml = "1.1"
tower-http = { version = "0.7", features = ["cors"] }
Expand All @@ -248,6 +250,7 @@ usage-rs = "7.3.0"
uuid = { version = "1.26", features = ["v7"] }
web-transport-proto = "0.6.4"
web-transport-trait = "0.5"
wgpu = "30"
x11rb = { version = "0.14.0", features = ["randr", "xfixes"] }
x509-cert = { version = "0.3", default-features = false }
x509-parser = "0.18"
Expand Down
1 change: 0 additions & 1 deletion quest/m2/api-shape/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,5 @@ Rejected in planning:

- [moq-net's small surface fixes](/quest/m2/api-shape/net.md) - one spelling per session, admission, compression, proxy, and priority surface, and no public wire codes
- [Transports take shared types](/quest/m2/api-shape/transport.md) - moq-uring takes a congestion factory and rustls configs, and the tokio server request stops exposing its QUIC internals
- [Crates re-export no whole crate](/quest/m2/api-shape/reexports.md) - no moq crate re-exports a whole crate, moq's own included, so a dependency bump is no moq break, and moq-mux's container `Guard` gets a name
- [Media crates' small surface fixes](/quest/m2/api-shape/media.md) - exporters, the container consumer, catalog color range, rate grant, moq-stats, JSON, and MSF each have one path and one name
- [Bindings' small surface fixes](/quest/m2/api-shape/bindings.md) - Go's read cancel, JSON producer construction, and the Python wheel's test module
92 changes: 0 additions & 92 deletions quest/m2/api-shape/reexports.md

This file was deleted.

2 changes: 1 addition & 1 deletion quest/m4/perf/stream/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Facts from the 2026-10-22 audit, so quests don't re-litigate them:
- The relay's WebSocket path is axum (hyper, `axum-server`, tokio-rustls),
then axum's tungstenite 0.29, converted zero-copy into qmux's tungstenite
0.30 (`rs/moq-relay/src/websocket.rs`). The relay therefore compiles two
tungstenite versions. qmux re-exports `tokio_tungstenite` and `tungstenite`
tungstenite versions. qmux names `tokio_tungstenite` and `tungstenite` types
in its public API (`rs/qmux/src/ws.rs`).
- tungstenite itself costs a zero-filled 128 KiB read buffer, a copy into
its `out_buffer` on write, and a memmove after a partial write. The layers
Expand Down
6 changes: 3 additions & 3 deletions quest/m4/perf/stream/codec.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ The subset to implement, from the 2026-10-22 audit:
A maintained crate was weighed against this. The codec is small, sits on the
hot path, and must write into the driver's buffers, so qmux owns it.

Public API: the `tokio_tungstenite` and `tungstenite` re-exports and the
`tungstenite` types in `Client::with_config`, `Client::with_connector`,
`Upgraded`, and `Error::WebSocket` go away. The Impact bullet says how to
Public API: the `tokio_tungstenite` and `tungstenite` types in
`Client::with_config`, `Client::with_connector`, `Upgraded`, and
`Error::WebSocket` go away. The Impact bullet says how to
migrate in `qmux` and `moq-tokio`. The existing qmux interop tests (the `qmux06`
dev-dependency) and the browser path in `js/qmux` must keep passing
unchanged.
Expand Down
3 changes: 0 additions & 3 deletions rs/hang/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,5 @@ pub mod catalog;
/// The container is the contents of each media track.
pub mod container;

/// Export the moq-net version we use.
pub use moq_net;

pub use catalog::Catalog;
pub use error::*;
4 changes: 2 additions & 2 deletions rs/moq-archive/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ are fetched from the store on request, and a growing archive is followed until
its producer marks it complete.

```bash
cargo add moq-archive
cargo add moq-archive object_store
```

```rust
use moq_archive::object_store::memory::InMemory;
use object_store::memory::InMemory;

// `broadcast` is a `moq_net::broadcast::Consumer`.
let store = moq_archive::Store::new(InMemory::new(), "recordings/demo");
Expand Down
2 changes: 1 addition & 1 deletion rs/moq-archive/benches/producer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
use std::time::{Duration, Instant};

use criterion::{BenchmarkId, Criterion, Throughput, criterion_group, criterion_main};
use moq_archive::object_store::memory::InMemory;
use moq_archive::{Producer, Store, producer};
use moq_net::{Timescale, Timestamp, broadcast, group, track};
use object_store::memory::InMemory;

const FRAMES_PER_GROUP: u64 = 2;

Expand Down
2 changes: 1 addition & 1 deletion rs/moq-archive/src/consumer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
//!
//! ```no_run
//! # async fn example(broadcast: moq_net::broadcast::Producer) -> moq_archive::Result<()> {
//! use moq_archive::object_store::memory::InMemory;
//! use object_store::memory::InMemory;
//!
//! let store = moq_archive::Store::new(InMemory::new(), "recordings/demo");
//! let consumer = moq_archive::Consumer::open(store, broadcast, Default::default()).await?;
Expand Down
2 changes: 0 additions & 2 deletions rs/moq-archive/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@

#![warn(missing_docs)]

pub use object_store;

pub mod consumer;
mod error;
/// The `.info` object holding a track's immutable properties.
Expand Down
2 changes: 1 addition & 1 deletion rs/moq-archive/src/producer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
//!
//! ```no_run
//! # async fn example(broadcast: moq_net::broadcast::Consumer) -> moq_archive::Result<()> {
//! use moq_archive::object_store::memory::InMemory;
//! use object_store::memory::InMemory;
//!
//! let store = moq_archive::Store::new(InMemory::new(), "recordings/demo");
//! moq_archive::Producer::new(store, broadcast, Default::default()).run().await?;
Expand Down
4 changes: 2 additions & 2 deletions rs/moq-audio/src/encode/producer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1890,11 +1890,11 @@ mod tests {
"packets forward before the group fills"
);
}
assert!(partial.poll_read_frame(&moq_net::kio::Waiter::noop()).is_pending());
assert!(partial.poll_read_frame(&kio::Waiter::noop()).is_pending());

if deferred {
producer.reanchor();
assert!(partial.poll_read_frame(&moq_net::kio::Waiter::noop()).is_pending());
assert!(partial.poll_read_frame(&kio::Waiter::noop()).is_pending());
} else {
producer.discontinuity().unwrap();
assert!(partial.read_frame().await.unwrap().is_none());
Expand Down
1 change: 1 addition & 0 deletions rs/moq-bench/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ websocket = ["moq-tokio/websocket"]

[dependencies]
anyhow = { workspace = true, features = ["backtrace"] }
bytes = { workspace = true }
humantime = { workspace = true }
kio = { workspace = true, features = ["runtime"] }
moq-net = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions rs/moq-bench/src/connection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ use std::sync::Arc;
use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
use std::time::Duration;

use bytes::Bytes;
use moq_net::{broadcast, group, track};
use moq_tokio::Status;
use moq_tokio::moq_net::{self, bytes::Bytes};
use moq_tokio::moq_net::{broadcast, group, track};
use rand::RngExt;
use serde::{Deserialize, Serialize};
use tokio::task::JoinSet;
Expand Down
2 changes: 1 addition & 1 deletion rs/moq-boy/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ use std::time::Duration;

#[cfg(feature = "jemalloc")]
#[global_allocator]
static ALLOC: moq_tokio::jemalloc::tikv_jemallocator::Jemalloc = moq_tokio::jemalloc::tikv_jemallocator::Jemalloc;
static ALLOC: moq_tokio::jemalloc::Allocator = moq_tokio::jemalloc::Allocator;

mod audio;
mod emulator;
Expand Down
2 changes: 1 addition & 1 deletion rs/moq-boy/src/status.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ impl StatusPublisher {
/// Also restates the status in a fresh group when a joiner wants one. Status is published every
/// frame, so checking here answers a joiner within a frame without a task of its own.
pub fn publish(&mut self, status: &Status) {
if let std::task::Poll::Ready(Err(err)) = self.producer.poll_refresh(&moq_net::kio::Waiter::noop()) {
if let std::task::Poll::Ready(Err(err)) = self.producer.poll_refresh(&kio::Waiter::noop()) {
tracing::warn!(%err, "failed to refresh status");
}
if let Err(err) = self
Expand Down
33 changes: 16 additions & 17 deletions rs/moq-c/src/consume.rs
Original file line number Diff line number Diff line change
Expand Up @@ -879,22 +879,21 @@ impl Consume {
// `close` is a oneshot that panics if polled after completion, so a `Stop`
// must unwind the whole task rather than fall through to the outer loop.
loop {
let mut group =
match moq_net::kio::wait(|waiter| -> Poll<Result<RawStep<moq_net::group::Consumer>, Error>> {
if Pin::new(&mut close).poll(&mut waiter.context()).is_ready() {
return Poll::Ready(Ok(RawStep::Stop));
}
match ready!(track.poll_next_group(waiter))? {
Some(group) => Poll::Ready(Ok(RawStep::Item(group))),
None => Poll::Ready(Ok(RawStep::End)),
}
})
.await?
{
RawStep::Item(group) => group,
// Track finished or the consumer was closed: nothing left to deliver.
RawStep::End | RawStep::Stop => return Ok(()),
};
let mut group = match kio::wait(|waiter| -> Poll<Result<RawStep<moq_net::group::Consumer>, Error>> {
if Pin::new(&mut close).poll(&mut waiter.context()).is_ready() {
return Poll::Ready(Ok(RawStep::Stop));
}
match ready!(track.poll_next_group(waiter))? {
Some(group) => Poll::Ready(Ok(RawStep::Item(group))),
None => Poll::Ready(Ok(RawStep::End)),
}
})
.await?
{
RawStep::Item(group) => group,
// Track finished or the consumer was closed: nothing left to deliver.
RawStep::End | RawStep::Stop => return Ok(()),
};

if Self::run_group(callback, &mut group, &mut close).await? {
return Ok(());
Expand All @@ -912,7 +911,7 @@ impl Consume {
close: &mut oneshot::Receiver<()>,
) -> Result<bool, Error> {
loop {
let frame = match moq_net::kio::wait(|waiter| -> Poll<Result<RawStep<moq_net::frame::Frame>, Error>> {
let frame = match kio::wait(|waiter| -> Poll<Result<RawStep<moq_net::frame::Frame>, Error>> {
if Pin::new(&mut *close).poll(&mut waiter.context()).is_ready() {
return Poll::Ready(Ok(RawStep::Stop));
}
Expand Down
Loading
Loading