Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3525adc
chore: claim subscriber close tail drain
kixelated Oct 16, 2026
b7afeba
fix(net): drain received group tails after session close
kixelated Oct 16, 2026
97083f1
Merge remote-tracking branch 'origin/main' into quest/m1/close-tail-d…
kixelated Oct 16, 2026
7f825ac
fix(net): keep delivery acknowledgements confined to close regressions
kixelated Oct 16, 2026
57313c4
docs(net): retain close-tail quest while qmux teardown blocks draining
kixelated Oct 16, 2026
71b8ee5
Merge remote-tracking branch 'origin/main' into quest/m1/close-tail-d…
kixelated Oct 20, 2026
c34cba5
test(net): keep close regressions agreeing with main's close codes
kixelated Oct 20, 2026
6b12ede
Merge remote-tracking branch 'origin/main' into pr-5762
kixelated Oct 21, 2026
922c73f
quest: fix the qmux teardown hang in qmux, consumed by a release bump
kixelated Oct 22, 2026
d0408cd
Merge remote-tracking branch 'origin/main' into close-tail-drain-qmux
kixelated Oct 22, 2026
fbed668
fix(deps): bump qmux to 0.6.5 for the teardown read fix
kixelated Oct 22, 2026
4329029
fix(net): end the lite drain when groups wait on an undeliverable SETUP
kixelated Oct 22, 2026
89e7943
Merge remote-tracking branch 'origin/main' into merge-5762
kixelated Oct 22, 2026
acbe35e
quest: delete the finished close-tail drain quest
kixelated Oct 22, 2026
1ff226c
Merge remote-tracking branch 'origin/main' into merge-5762
kixelated Oct 22, 2026
f2e52db
Merge remote-tracking branch 'origin/main' into merge-5762-b
kixelated Oct 22, 2026
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: 5 additions & 5 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ percent-encoding = "2"
pollster = "1.0"
# default-features off to skip the fork and timeout machinery; crates opt into what they use.
proptest = { version = "1.12.0", default-features = false, features = ["std"] }
qmux = { version = "0.6.3", default-features = false }
qmux = { version = "0.6.5", default-features = false }
rand = "0.10.1"
rangemap = "1.8"
# default-features off so each consumer picks its crypto provider.
Expand Down
1 change: 0 additions & 1 deletion quest/m1/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ lite-07 stream type here.
- [Rust resume holds a declared end](/quest/m1/resume-rust-end.md) - a resumed Rust track keeps a declared end across copies, dedupes flapping copies, and judges retention inside the reader's window
- [Received timestamps are media time](/quest/m1/lite-time-provenance.md) - a received timed track's timestamps are media time, so the rewind check can run across hops
- [WebGPU on Safari](/quest/m1/webgpu-safari.md) - the WebGPU renderer is verified on Safari 26 for macOS and iOS
- [Close tail drain](/quest/m1/close-tail-drain.md) - after a peer close, subscribers read the group streams their transport already delivered instead of aborting them, so a finished tail arrives on every version
- [Silent-peer close](/quest/m1/quic-silent-peer-drain.md) - moq-quic closes a connection that never heard its peer without the 3 s drain
- [Binding linger](/quest/m1/linger-ffi.md) - `moq-ffi` and every binding finish a broadcast cleanly, so subscribers drain it until its media is stale
- [Gateway linger](/quest/m1/linger-gateways.md) - HLS, RTMP, SRT and RTC imports linger at a clean end, cut short by a newer epoch at the same path
Expand Down
85 changes: 0 additions & 85 deletions quest/m1/close-tail-drain.md

This file was deleted.

45 changes: 36 additions & 9 deletions rs/moq-net/src/ietf/adapter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -522,18 +522,45 @@ impl<S: crate::transport::poll::Session> crate::transport::poll::SendStream for
}
}

/// Preserve the real receive stream's registries through the shared-control adapter.
/// Virtual streams have only local errors, while data streams still carry raw codes.
#[derive(Debug, thiserror::Error)]
#[non_exhaustive]
pub enum RecvError<E: crate::transport::Error> {
#[error(transparent)]
Real(E),
#[error(transparent)]
Virtual(crate::Error),
}

impl<E: crate::transport::Error> crate::transport::Error for RecvError<E> {
fn session_error(&self) -> Option<(u32, String)> {
match self {
Self::Real(err) => err.session_error(),
Self::Virtual(err) => err.session_error(),
}
}

fn stream_error(&self) -> Option<u32> {
match self {
Self::Real(err) => err.stream_error(),
Self::Virtual(err) => err.stream_error(),
}
}
}

pub enum AdapterRecv<S: crate::transport::poll::Session> {
Real(S::RecvStream),
Virtual(VirtualRecvStream),
}

impl<S: crate::transport::poll::Session> crate::transport::poll::RecvStream for AdapterRecv<S> {
type Error = crate::Error;
type Error = RecvError<<S::RecvStream as crate::transport::poll::RecvStream>::Error>;

fn poll_read(&mut self, cx: &mut Context<'_>, dst: &mut [u8]) -> Poll<Result<Option<usize>, Self::Error>> {
match self {
Self::Real(s) => s.poll_read(cx, dst).map(|r| r.map_err(|_| crate::Error::Closed)),
Self::Virtual(s) => s.poll_read(cx, dst),
Self::Real(s) => s.poll_read(cx, dst).map(|r| r.map_err(RecvError::Real)),
Self::Virtual(s) => s.poll_read(cx, dst).map_err(RecvError::Virtual),
}
}

Expand All @@ -543,15 +570,15 @@ impl<S: crate::transport::poll::Session> crate::transport::poll::RecvStream for
buf: &mut B,
) -> Poll<Result<Option<usize>, Self::Error>> {
match self {
Self::Real(s) => s.poll_read_buf(cx, buf).map(|r| r.map_err(|_| crate::Error::Closed)),
Self::Virtual(s) => s.poll_read_buf(cx, buf),
Self::Real(s) => s.poll_read_buf(cx, buf).map(|r| r.map_err(RecvError::Real)),
Self::Virtual(s) => s.poll_read_buf(cx, buf).map_err(RecvError::Virtual),
}
}

fn poll_read_chunk(&mut self, cx: &mut Context<'_>, max: usize) -> Poll<Result<Option<Bytes>, Self::Error>> {
match self {
Self::Real(s) => s.poll_read_chunk(cx, max).map(|r| r.map_err(|_| crate::Error::Closed)),
Self::Virtual(s) => s.poll_read_chunk(cx, max),
Self::Real(s) => s.poll_read_chunk(cx, max).map(|r| r.map_err(RecvError::Real)),
Self::Virtual(s) => s.poll_read_chunk(cx, max).map_err(RecvError::Virtual),
}
}

Expand All @@ -564,8 +591,8 @@ impl<S: crate::transport::poll::Session> crate::transport::poll::RecvStream for

fn poll_closed(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
match self {
Self::Real(s) => s.poll_closed(cx).map(|r| r.map_err(|_| crate::Error::Closed)),
Self::Virtual(s) => s.poll_closed(cx),
Self::Real(s) => s.poll_closed(cx).map(|r| r.map_err(RecvError::Real)),
Self::Virtual(s) => s.poll_closed(cx).map_err(RecvError::Virtual),
}
}
}
Expand Down
Loading
Loading