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
1 change: 0 additions & 1 deletion quest/m2/api-shape/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,4 @@ Rejected in planning:

## Required

- [moq-net's route stream goes public](/quest/m2/api-shape/net.md) - un-hide `origin::Consumer::routes` and reshape `RouteEvent`, now that #8063 merged
- [Ban doc(hidden) in Rust](/quest/m2/api-shape/doc-hidden.md) - `just check` bans it; each use becomes private or documented, test-support modules documented behind their feature
43 changes: 0 additions & 43 deletions quest/m2/api-shape/net.md

This file was deleted.

5 changes: 0 additions & 5 deletions quest/m2/instance-provenance.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,3 @@ lite-07 (SUBSCRIBE_DROP and SUBSCRIBE_SKIP ranges) and touches
`lite/subscriber.rs`, `lite/subscribe.rs`, their JS mirrors, and the lite
draft, but not the instance encoding; expect textual conflicts only, and
whichever lands second adds its changelog line beside the other's.

## Related

- [moq-net's route stream goes public](/quest/m2/api-shape/net.md) - the
audit item this replaces
2 changes: 1 addition & 1 deletion quest/m3/qos/lag-histogram.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ re-exported by `moq-stats`. Wire: the stats JSON gains the egress fields.
Update `doc/concept/stats.md` and the stats section of
`doc/bin/relay/config.md`.

Changed 2026-11-07 (maintainer, /quest-plan from the API sweep of open PRs and remaining quests): [api-shape/net](/quest/m2/api-shape/net.md) makes `stats::Registry::report` take `now` and the handle's arguments `#[non_exhaustive]` before the cut, so this adds fields and is not breaking.
Changed 2026-11-07 (maintainer, /quest-plan from the API sweep of open PRs and remaining quests): [moq-dev/moq#8266](https://github.com/moq-dev/moq/pull/8266) makes `stats::Registry::report` take `now` and the handle's arguments `#[non_exhaustive]` before the cut, so this adds fields and is not breaking.

## Required

Expand Down
2 changes: 1 addition & 1 deletion quest/m3/session-outcome-records.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,4 @@ Tests: a refused session and an abnormal end each produce exactly one record
under the right label; a flood past the rate produces summaries whose counts
match the counters; an admitted session that ends normally produces none.

Changed 2026-11-07 (maintainer, /quest-plan from the API sweep of open PRs and remaining quests): [api-shape/net](/quest/m2/api-shape/net.md) makes `stats::Handle::{refuse, session}` take `#[non_exhaustive]` structs before the cut, so the records add fields and are not breaking.
Changed 2026-11-07 (maintainer, /quest-plan from the API sweep of open PRs and remaining quests): [moq-dev/moq#8266](https://github.com/moq-dev/moq/pull/8266) makes `stats::Handle::{refuse, session}` take `#[non_exhaustive]` structs before the cut, so the records add fields and are not breaking.
2 changes: 1 addition & 1 deletion quest/m5/rate-grant.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ Public API: the in-band grant types in `rs/moq-net` and `js/net` gain the two
rates, and the publishers gain a clamp. Wire: the AUTH grant gains optional
rates, on the next unpublished lite version after lite-07 only.

Changed 2026-11-07 (maintainer, /quest-plan from the API sweep of open PRs and remaining quests): [api-shape/net](/quest/m2/api-shape/net.md) makes `auth::Grant` `#[non_exhaustive]` before the cut, so the rates are additive fields.
Changed 2026-11-07 (maintainer, /quest-plan from the API sweep of open PRs and remaining quests): [moq-dev/moq#8266](https://github.com/moq-dev/moq/pull/8266) makes `auth::Grant` `#[non_exhaustive]` before the cut, so the rates are additive fields.
5 changes: 4 additions & 1 deletion rs/moq-cli/tests/integration/export.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1064,7 +1064,10 @@ async fn next_instance(announced: &mut moq_net::origin::Routes) -> moq_net::Inst
kio::clock::timeout(TIMEOUT, async {
loop {
match announced.next().await.expect("the relay stays up") {
moq_net::origin::RouteEvent::Start(announce) | moq_net::origin::RouteEvent::Restart(announce) => {
moq_net::origin::RouteEvent {
kind: moq_net::origin::RouteKind::Start | moq_net::origin::RouteKind::Restart,
announce,
} => {
return announce.route.instance().clone();
}
_ => continue,
Expand Down
49 changes: 41 additions & 8 deletions rs/moq-cli/tests/integration/instances.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,27 @@ fn publish(origin: &origin::Producer, instance: &Instance, tag: &str) -> Publish
async fn changed(follow: &mut origin::Routes) -> bool {
loop {
match follow.next().await.unwrap() {
origin::RouteEvent::Restart(_) => return true,
origin::RouteEvent::End(_) => {
assert!(matches!(follow.next().await, Some(origin::RouteEvent::Start(_))));
origin::RouteEvent {
kind: origin::RouteKind::Restart,
..
} => return true,
origin::RouteEvent {
kind: origin::RouteKind::End,
..
} => {
assert!(matches!(
follow.next().await,
Some(origin::RouteEvent {
kind: origin::RouteKind::Start,
..
})
));
return false;
}
origin::RouteEvent::Update(_) => {}
origin::RouteEvent {
kind: origin::RouteKind::Update,
..
} => {}
other => panic!("expected replacement, got {other:?}"),
}
}
Expand Down Expand Up @@ -146,9 +161,18 @@ async fn replacement(version: &str) {
.unwrap();
assert!(matches!(
catalog_follow.next().await,
Some(origin::RouteEvent::Start(_))
Some(origin::RouteEvent {
kind: origin::RouteKind::Start,
..
})
));
assert!(matches!(
media_follow.next().await,
Some(origin::RouteEvent {
kind: origin::RouteKind::Start,
..
})
));
assert!(matches!(media_follow.next().await, Some(origin::RouteEvent::Start(_))));

let held = viewer.request("live/catalog.hang", None).await.unwrap();
let old = moq_mux::Source::new(viewer.clone(), held);
Expand Down Expand Up @@ -380,7 +404,13 @@ async fn a_player_reads_through_a_claim_on_its_first_request() {
.established()
.await
.unwrap();
assert!(matches!(routes.next().await, Some(origin::RouteEvent::Start(_))));
assert!(matches!(
routes.next().await,
Some(origin::RouteEvent {
kind: origin::RouteKind::Start,
..
})
));

let held = viewer.request("live/catalog.hang", None).await.unwrap();
let source = moq_mux::Source::new(viewer.clone(), held);
Expand Down Expand Up @@ -414,7 +444,10 @@ async fn a_player_reads_through_a_claim_on_its_first_request() {
assert_ne!(worker.claim.instance(), lent);
loop {
match routes.next().await.unwrap() {
origin::RouteEvent::End(end) if end.prefix.as_str() == "live/media" => break,
origin::RouteEvent {
kind: origin::RouteKind::End,
announce: end,
} if end.prefix.as_str() == "live/media" => break,
_ => {}
}
}
Expand Down
10 changes: 8 additions & 2 deletions rs/moq-cli/tests/integration/rtsp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,14 @@ async fn next_broadcast(
.await
.expect("origin closed")
{
moq_net::origin::RouteEvent::Start(_) | moq_net::origin::RouteEvent::Restart(_) => break,
moq_net::origin::RouteEvent::End(_) | moq_net::origin::RouteEvent::Update(_) => {}
moq_net::origin::RouteEvent {
kind: moq_net::origin::RouteKind::Start | moq_net::origin::RouteKind::Restart,
..
} => break,
moq_net::origin::RouteEvent {
kind: moq_net::origin::RouteKind::End | moq_net::origin::RouteKind::Update,
..
} => {}
}
}
let broadcast = running(child, "the broadcast", consumer.request("camera", None))
Expand Down
Loading
Loading