diff --git a/.github/workflows/moq-release.yml b/.github/workflows/moq-release.yml index 0229f0513a..4487d3ff9c 100644 --- a/.github/workflows/moq-release.yml +++ b/.github/workflows/moq-release.yml @@ -1,5 +1,5 @@ -# Publishes moq-noq-proto, moq-noq-udp, and moq-noq when a `v*` tag is pushed. -# The tag must match `workspace.package.version`. +# Publishes moq-noq-proto, moq-noq-udp, moq-noq, and web-transport-moq when a `v*` tag +# is pushed. The tag must match `workspace.package.version`. # # Uses crates.io trusted publishing, so each crate must list this repository # and workflow as a trusted publisher. The very first version of a crate has to diff --git a/CHANGELOG-MOQ.md b/CHANGELOG-MOQ.md new file mode 100644 index 0000000000..f760d2e8fa --- /dev/null +++ b/CHANGELOG-MOQ.md @@ -0,0 +1,42 @@ +# Changelog (moq-dev fork) + +Releases of `moq-noq`, `moq-noq-proto`, `moq-noq-udp`, and `web-transport-moq`. +All four share one version. [CHANGELOG.md](CHANGELOG.md) is upstream's and +covers the parent. Each entry names the parent commit it carries and every +change the fork carries on top, with its upstream status, so an advisory +against the parent can be checked against a release. + +## 1.3.1 + +Parent: n0-computer/noq [`1a26a8b0`](https://github.com/n0-computer/noq/commit/1a26a8b064d21e316fe6769f068617975bd8a27b), unchanged since 1.3.0. + +### BBR correctness + +- [#3](https://github.com/moq-dev/noq/pull/3) identify BBR packets by space and number, so a Handshake ACK no longer samples an Initial packet with the same number. +- [#4](https://github.com/moq-dev/noq/pull/4) fold each ACK into BBR's model once, after the whole ACK completes. +- [#5](https://github.com/moq-dev/noq/pull/5) tell the controller of application starvation before the next send, not at the next ACK. +- [#6](https://github.com/moq-dev/noq/pull/6) finish bandwidth-probe feedback once: a finished probe ages the max-bw window once and stops classifying losses as probe feedback. +- [#7](https://github.com/moq-dev/noq/pull/7) recalibrate startup pacing from the first measured RTT instead of the 1ms placeholder. +- [#8](https://github.com/moq-dev/noq/pull/8) mark packets sent during ProbeRTT application-limited, so its reduced rate cannot lower the bandwidth model. +- [#9](https://github.com/moq-dev/noq/pull/9) keep BBR's undo snapshot for the whole recovery episode, so a spurious loss restores the model, window, and probe. + +### API + +Additive; existing `Controller` implementations compile unchanged. + +- `congestion::PacketId` and `congestion::Space` identify a packet by space and number. +- `Controller` gains `on_packet_space_sent`, `on_packet_space_acked`, `on_packet_space_lost`, and `on_congestion_event_space`. Each defaults to the number-only callback it replaces, which is now deprecated. +- `Controller::on_congestion_event` has a default body, so it is no longer required. +- `Controller::on_app_limited(in_flight)` reports a transmit poll with nothing to send. + +### Upstream status + +- #7 carries [n0-computer/noq#802](https://github.com/n0-computer/noq/pull/802) (open) with authorship kept, plus a fix for its one-ACK-late trigger and 1ms floor; the bug is [n0-computer/noq#800](https://github.com/n0-computer/noq/issues/800). +- The rest are not offered yet: they build on the fork-only `PacketId` callbacks, and the series goes upstream together once its shape settles. + +## 1.3.0 + +Parent: n0-computer/noq [`1a26a8b0`](https://github.com/n0-computer/noq/commit/1a26a8b064d21e316fe6769f068617975bd8a27b). + +- [#1](https://github.com/moq-dev/noq/pull/1) publish as `moq-noq`, `moq-noq-proto`, and `moq-noq-udp`. Fork-only: packaging. +- [#2](https://github.com/moq-dev/noq/pull/2) add `web-transport-moq`, the WebTransport adapter over the fork. Fork-only: packaging. diff --git a/Cargo.lock b/Cargo.lock index db512399fe..6e0b9335ba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1876,7 +1876,7 @@ dependencies = [ [[package]] name = "moq-noq" -version = "1.3.0" +version = "1.3.1" dependencies = [ "anyhow", "async-executor", @@ -1919,7 +1919,7 @@ dependencies = [ [[package]] name = "moq-noq-proto" -version = "1.3.0" +version = "1.3.1" dependencies = [ "aes-gcm", "arbitrary", @@ -1959,7 +1959,7 @@ dependencies = [ [[package]] name = "moq-noq-udp" -version = "1.3.0" +version = "1.3.1" dependencies = [ "cfg_aliases", "criterion", @@ -3531,7 +3531,7 @@ dependencies = [ [[package]] name = "web-transport-moq" -version = "1.3.0" +version = "1.3.1" dependencies = [ "anyhow", "bytes", diff --git a/Cargo.toml b/Cargo.toml index 27fc4ad72f..4cc657473a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ default-members = ["noq", "noq-proto", "noq-udp", "web-transport-moq", "bench", resolver = "2" [workspace.package] -version = "1.3.0" +version = "1.3.1" rust-version = "1.88" edition = "2024" license = "MIT OR Apache-2.0" diff --git a/README.md b/README.md index 9d79fed5d4..18e69d9a50 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,8 @@ needs before they land upstream, and it never publishes under the parent's names. `PARENT` names the upstream commit each release includes, and `moq-sync` merges upstream weekly. General changes are offered upstream once their shape settles; the carried set -is `git log --no-merges upstream/main..main`. +is `git log --no-merges upstream/main..main`. [CHANGELOG-MOQ.md](CHANGELOG-MOQ.md) lists each +release's parent and carried changes. The upstream README follows. diff --git a/noq/Cargo.toml b/noq/Cargo.toml index 723bfea097..ffead174b2 100644 --- a/noq/Cargo.toml +++ b/noq/Cargo.toml @@ -67,13 +67,13 @@ derive_more = { workspace = true } futures-io = { workspace = true, optional = true } rustc-hash = { workspace = true } pin-project-lite = { workspace = true } -proto = { package = "moq-noq-proto", path = "../noq-proto", version = "1.3.0", default-features = false } +proto = { package = "moq-noq-proto", path = "../noq-proto", version = "1.3.1", default-features = false } rustls = { workspace = true, optional = true } smol = { workspace = true, optional = true } thiserror = { workspace = true } tracing = { workspace = true } tokio = { workspace = true } -udp = { package = "moq-noq-udp", path = "../noq-udp", version = "1.3.0", default-features = false, features = ["tracing"] } +udp = { package = "moq-noq-udp", path = "../noq-udp", version = "1.3.1", default-features = false, features = ["tracing"] } # Fix minimal dependencies for indirect deps async-global-executor = { workspace = true, optional = true } diff --git a/web-transport-moq/Cargo.toml b/web-transport-moq/Cargo.toml index d6f28a071e..657f2fc247 100644 --- a/web-transport-moq/Cargo.toml +++ b/web-transport-moq/Cargo.toml @@ -28,7 +28,7 @@ bytes = "1" futures = "0.3" http = "1" kio = "0.5.4" -noq = { package = "moq-noq", path = "../noq", version = "1.3.0", default-features = false, features = [ +noq = { package = "moq-noq", path = "../noq", version = "1.3.1", default-features = false, features = [ "tracing-log", "platform-verifier", "runtime-tokio",