From 4c766518e8ca27dab4c38c8b7e0bdfc2e6233ad6 Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Thu, 5 Nov 2026 22:28:23 -0800 Subject: [PATCH 1/4] chore(quest): claim quest/m1/moq-e2ee-remove.md Quest-Claim: 99980e3b44ca38aa From 5b8bfcbda4e7398b8121e6aead68a61b7d0055fd Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Thu, 5 Nov 2026 22:29:22 -0800 Subject: [PATCH 2/4] chore(moq-e2ee): remove the retired stub crate moq-e2ee 0.0.22, the final release pointing to moq-crypto, is on crates.io. Also drops the duplicate m3 retire quest. Co-Authored-By: Claude Opus 5.5 --- Cargo.lock | 7 ------- quest/m1/README.md | 1 - quest/m1/moq-e2ee-remove.md | 30 ---------------------------- quest/m3/crates-trusted-publisher.md | 2 +- quest/m3/release-rs-oidc.md | 1 - quest/m3/release/README.md | 1 - quest/m3/release/e2ee-retire.md | 29 --------------------------- rs/moq-e2ee/Cargo.toml | 19 ------------------ rs/moq-e2ee/README.md | 10 ---------- rs/moq-e2ee/src/lib.rs | 1 - 10 files changed, 1 insertion(+), 100 deletions(-) delete mode 100644 quest/m1/moq-e2ee-remove.md delete mode 100644 quest/m3/release/e2ee-retire.md delete mode 100644 rs/moq-e2ee/Cargo.toml delete mode 100644 rs/moq-e2ee/README.md delete mode 100644 rs/moq-e2ee/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index 455b5dc925b..b34398ed36c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4565,13 +4565,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "moq-e2ee" -version = "0.0.11" -dependencies = [ - "workspace-hack", -] - [[package]] name = "moq-ffi" version = "0.4.12" diff --git a/quest/m1/README.md b/quest/m1/README.md index e8bbbfac793..dad4813fdf3 100644 --- a/quest/m1/README.md +++ b/quest/m1/README.md @@ -50,7 +50,6 @@ the same reason, gates the cut through the - [Push-to-talk's press-to-audible latency fits a budget on the defaults](/quest/m1/push-to-talk-latency.md) - press to audible on the browser defaults, excluding device output, stays under a kixtop-measured budget that `just test push-to-talk` enforces - [TS fidelity and recovery](/quest/m1/ts-reliability/README.md) - both modes have explicit profiles, automated validation, loss tests, and a dedicated guide - [WebGPU on Safari](/quest/m1/webgpu-safari.md) - the WebGPU renderer is verified on Safari 26 for macOS and iOS -- [Remove the moq-e2ee stub](/quest/m1/moq-e2ee-remove.md) - `rs/moq-e2ee` leaves the workspace and release config now that its final release points to moq-crypto - [Main is no slower than release](/quest/m1/release-perf/README.md) - every benchmark where main is slower than release is fixed or accepted with a reason, checked by a final paired run before the cut - [Calibrate the paired nightly benchmarks](/quest/m1/bench-ci.md) - `rust-bench` fits its hour and gets A/A runs, and separate builds of unchanged code stop measuring as a slowdown, so every paired regression alert can be trusted - [moq-json's table/deltas bench measures the same work every iteration](/quest/m1/bench-json-deltas.md) - the `table/deltas/1%` cases stop flipping between snapshot and delta timings, so their trend history is usable diff --git a/quest/m1/moq-e2ee-remove.md b/quest/m1/moq-e2ee-remove.md deleted file mode 100644 index 28dd27a4c90..00000000000 --- a/quest/m1/moq-e2ee-remove.md +++ /dev/null @@ -1,30 +0,0 @@ -# [XS] Remove the moq-e2ee stub - -## Goal - -`rs/moq-e2ee` leaves the workspace, along with any release or version config -that names it, so release-plz stops tracking a crate whose final release is -out. moq-e2ee 0.0.22, the final no-code release pointing users to -moq-crypto, is on crates.io. - -## Plan - -Decided 2026-11-05 (maintainer, /quest-audit): ✅ retire the stub before -[Rust releases publish through OIDC](/quest/m3/release-rs-oidc.md), so the -crate never needs a trusted publisher. - -Published 2026-11-05 (maintainer, /quest-unblock, by an agent at the -maintainer's request): moq-e2ee 0.0.22 from `main`'s stub, with only the -version raised from 0.0.11 locally, since 0.0.21 on crates.io (2026-11-03) and -on `release` is still the full implementation. A 0.0.x caret requirement never -resolves to the next patch, so no dependent upgrades into the stub -unasked. Not chosen: publishing it through the m2 cut; deleting the crate -with no final release. - -- Delete `rs/moq-e2ee` (the workspace's `rs/*` glob picks it up) and its - `Cargo.lock` entry. -- Search release-plz, `version.json`, workflows, and docs for `moq-e2ee` and - drop what names the crate. The `moq-e2ee-*` draft profiles and the - `draft-lcurley-moq-e2ee` drafts are the protocol, not the crate, and stay. - -Public API: none; the crate has no code. Wire: none. diff --git a/quest/m3/crates-trusted-publisher.md b/quest/m3/crates-trusted-publisher.md index 24b9b133146..5a18e7186ce 100644 --- a/quest/m3/crates-trusted-publisher.md +++ b/quest/m3/crates-trusted-publisher.md @@ -54,7 +54,7 @@ the trusted publisher. Only the 7 unpublished crates remain. Decided 2026-11-05 (maintainer, /quest-audit): moq-e2ee, published but retired in favor of moq-crypto, gets no trusted publisher; -[Remove the moq-e2ee stub](/quest/m1/moq-e2ee-remove.md) takes it out of the +a later change took it out of the workspace instead. ## Required diff --git a/quest/m3/release-rs-oidc.md b/quest/m3/release-rs-oidc.md index 49aa3e242bc..42c4f32d439 100644 --- a/quest/m3/release-rs-oidc.md +++ b/quest/m3/release-rs-oidc.md @@ -34,5 +34,4 @@ authentication Action is needed. ## Required -- [Remove the moq-e2ee stub](/quest/m1/moq-e2ee-remove.md) - release-plz stops tracking a retired crate that has no trusted publisher - [crates.io trusts the workflow](/quest/m3/crates-trusted-publisher.md) - every published crate has the trusted publisher configured diff --git a/quest/m3/release/README.md b/quest/m3/release/README.md index e5184edc1c0..b817c0bbca5 100644 --- a/quest/m3/release/README.md +++ b/quest/m3/release/README.md @@ -39,7 +39,6 @@ production stability proven merely because upstream artifacts published. - [Dart publication](/quest/m3/release/dart-publish.md) - the wrapper and native artifacts install from the registry - [Final libmoq stub](/quest/m3/release/libmoq-final-release.md) - publish the migration notice before removing its source - [Retire libmoq](/quest/m3/release/libmoq-retire.md) - cleanup only after that publication -- [Retire the moq-e2ee stub](/quest/m3/release/e2ee-retire.md) - delete `rs/moq-e2ee` once the cut publishes it as the final release - [Retire hand-written C](/quest/m3/release/c-retire.md) - delete the hand-written crate once generated C publishes - [Retire the web-transport JS qmux](/quest/m3/release/qmux-js-retire.md) - once `@moq/qmux` publishes from `js/qmux`, deprecate `@moq/web-socket-stream` and stop the second publisher - [moq.sh deployment](/quest/m3/release/moq-sh-deploy.md) - verify its release-triggered publication diff --git a/quest/m3/release/e2ee-retire.md b/quest/m3/release/e2ee-retire.md deleted file mode 100644 index d44a09b95db..00000000000 --- a/quest/m3/release/e2ee-retire.md +++ /dev/null @@ -1,29 +0,0 @@ -# [XS] Retire the moq-e2ee stub - -## Goal - -`rs/moq-e2ee` is gone and the `moq-e2ee` crate is no longer published. Its -last release, a code-free crate whose README points at moq-crypto, stays on -crates.io for anyone still resolving the old name. - -## Plan - -Decided 2026-11-03 (maintainer, /quest-plan of the follow-ups from -[moq-dev/moq#7702](https://github.com/moq-dev/moq/pull/7702)): milestone m2, -mirroring [Retire libmoq](/quest/m3/release/libmoq-retire.md). - -- #7702 leaves `rs/moq-e2ee` as a code-free stub, and - [the cut](/quest/m3/release/cut.md) publishes it at a version above - crates.io's 0.0.20. Check with `curl -s - https://crates.io/api/v1/crates/moq-e2ee | jq -r .crate.max_version` that - the stub's version is the newest. -- Then delete `rs/moq-e2ee` and its workspace member, so release-plz never - publishes it again, and grep for any remaining `moq-e2ee` or `moq_e2ee`. - Keep the draft and profile names (`draft-lcurley-moq-e2ee`, "moq-e2ee - epoch"), which name the format, not the crate. (Folded in from - moq-dev/moq#7748's duplicate "Retire the moq-e2ee stub", 2026-11-04.) -- moq-sign was never published, so it needs no stub. - -## Required - -- [Cut and publish](/quest/m3/release/cut.md) - publishes the stub as moq-e2ee's final release diff --git a/rs/moq-e2ee/Cargo.toml b/rs/moq-e2ee/Cargo.toml deleted file mode 100644 index 96a0d95ab56..00000000000 --- a/rs/moq-e2ee/Cargo.toml +++ /dev/null @@ -1,19 +0,0 @@ -[package] -name = "moq-e2ee" -description = "Renamed to moq-crypto: end-to-end encryption for MoQ groups, datagrams, and track names" -authors = ["Luke Curley "] -repository = "https://github.com/moq-dev/moq" -license = "MIT OR Apache-2.0" - -version = "0.0.11" -edition = "2024" -rust-version.workspace = true - -keywords = ["quic", "webtransport", "encryption", "live"] -categories = ["cryptography", "multimedia", "network-programming"] - -[dev-dependencies] -workspace-hack = { path = "../workspace-hack" } - -[lints] -workspace = true diff --git a/rs/moq-e2ee/README.md b/rs/moq-e2ee/README.md deleted file mode 100644 index 390a410948a..00000000000 --- a/rs/moq-e2ee/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# moq-e2ee - -`moq-e2ee` is now the `e2ee` module of -[`moq-crypto`](https://github.com/moq-dev/moq/tree/main/rs/moq-crypto), which -also holds content signing, and this final release contains no code. - -The profile and wire are unchanged. Depend on `moq-crypto` and import from -`moq_crypto::e2ee` in place of `moq_e2ee`; see its -[MIGRATE.md](https://github.com/moq-dev/moq/blob/main/rs/moq-crypto/MIGRATE.md) -for the rest of the changes since `moq-e2ee` 0.0.20. diff --git a/rs/moq-e2ee/src/lib.rs b/rs/moq-e2ee/src/lib.rs deleted file mode 100644 index 7913c79d6bc..00000000000 --- a/rs/moq-e2ee/src/lib.rs +++ /dev/null @@ -1 +0,0 @@ -#![doc = include_str!("../README.md")] From 6afa6636967293741aa6ddc7a5962a8699341268 Mon Sep 17 00:00:00 2001 From: "pullfrog[bot]" <226033991+pullfrog[bot]@users.noreply.github.com> Date: Fri, 6 Nov 2026 07:05:54 +0000 Subject: [PATCH 3/4] fix(moq-ffi): poll a woken ready call before reading on concurrent_ready_calls_all_wake drains frames as fast as the group buffers them. A read wakes both parked ready calls, but the loop only checked them after the next read, so draining the window before the runtime polled them left it parked on a group no one writes again and the 10s timeout fired (3/120 pinned single-core runs under load). Check the calls at the top of the loop and yield after each read, so a call the read woke runs before the next one. Both still fail the test if stranded; 160/160 pinned runs pass. --- rs/moq-ffi/src/test.rs | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/rs/moq-ffi/src/test.rs b/rs/moq-ffi/src/test.rs index 7f5c2e452cd..929ae4bd758 100644 --- a/rs/moq-ffi/src/test.rs +++ b/rs/moq-ffi/src/test.rs @@ -9482,14 +9482,18 @@ async fn concurrent_ready_calls_all_wake() { ]; assert!(waits.iter().all(|wait| !wait.is_finished()), "the window was not full"); - while let Some(_frame) = kio::clock::timeout(TIMEOUT, reader.read_frame()) - .await - .expect("the read stalled") - .unwrap() - { - if waits.iter().all(|wait| wait.is_finished()) { + // Every read wakes both calls. Run them before the next read: draining the window + // faster than the runtime polls a woken call leaves this loop waiting on a group + // nobody writes again. + while !waits.iter().all(|wait| wait.is_finished()) { + let Some(_frame) = kio::clock::timeout(TIMEOUT, reader.read_frame()) + .await + .expect("the read stalled") + .unwrap() + else { break; - } + }; + tokio::task::yield_now().await; ffi_caught_up().await; } for wait in waits { From 61fa16e17e9e6af328540fc9a2217515cd508502 Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Fri, 6 Nov 2026 07:56:57 -0800 Subject: [PATCH 4/4] fix: bound the ready drain loop and drop the moq-e2ee cut step Co-Authored-By: Claude Opus 5.5 --- quest/m3/release/cut.md | 7 +++---- rs/moq-ffi/src/test.rs | 17 +++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/quest/m3/release/cut.md b/quest/m3/release/cut.md index b3784f15211..830436bcf88 100644 --- a/quest/m3/release/cut.md +++ b/quest/m3/release/cut.md @@ -68,10 +68,9 @@ From the 2026-10-25 pre-cut run: From [moq-dev/moq#7702](https://github.com/moq-dev/moq/pull/7702), which merged moq-e2ee and moq-sign into moq-crypto (decided 2026-11-02, no yank): -- Publish `main`'s code-free `rs/moq-e2ee` stub, whose README points at - moq-crypto, as moq-e2ee's final release. It must take a version above - crates.io's current `max_version` (0.0.20 on 2026-11-02); check with - `curl -s https://crates.io/api/v1/crates/moq-e2ee`. +- Nothing to publish for moq-e2ee: its final code-free release, 0.0.22, + already points at moq-crypto, and `rs/moq-e2ee` is gone. Don't merge a + `release` branch release-plz proposal that bumps it. The [2026-10-22 release audit](https://github.com/moq-dev/moq/pull/7176) closed with its fixes rechecked together. At source candidate diff --git a/rs/moq-ffi/src/test.rs b/rs/moq-ffi/src/test.rs index 929ae4bd758..261ce06b992 100644 --- a/rs/moq-ffi/src/test.rs +++ b/rs/moq-ffi/src/test.rs @@ -9482,17 +9482,18 @@ async fn concurrent_ready_calls_all_wake() { ]; assert!(waits.iter().all(|wait| !wait.is_finished()), "the window was not full"); - // Every read wakes both calls. Run them before the next read: draining the window - // faster than the runtime polls a woken call leaves this loop waiting on a group - // nobody writes again. - while !waits.iter().all(|wait| wait.is_finished()) { - let Some(_frame) = kio::clock::timeout(TIMEOUT, reader.read_frame()) + // Every read wakes both calls. Run them before the next read, and read no more than + // was written: draining the window faster than the runtime polls a woken call must + // not leave this loop waiting on a group nobody writes again. + for _ in 0..24 { + if waits.iter().all(|wait| wait.is_finished()) { + break; + } + kio::clock::timeout(TIMEOUT, reader.read_frame()) .await .expect("the read stalled") .unwrap() - else { - break; - }; + .expect("the group ended early"); tokio::task::yield_now().await; ffi_caught_up().await; }