Merge main into dev

[kixelated]

Merge main into dev

Merges main (63 commits) into dev (137 commits since the last sync). The branches had diverged heavily because several dev crates (moq-mux, moq-hls, moq-rtc, moq-rtmp, moq-srt) were squash-backported to main and then evolved independently on both sides, producing ~180 conflicted files including whole-crate add/add conflicts.

Resolution policy

• dev wins on architecture: the moq-lite-05 wire protocol, the reshaped moq-net API (infallible request_broadcast/subscribe, Arc<Info> ownership, two-phase accept, mandatory timestamps, no per-frame compression), and the moq-mux restructure (per-codec splitters, import/ module).
• main's features and fixes were ported onto dev's shapes. Where the same change landed on both sides in different form (backports/double-lands), dev's form was kept.

Main-side features preserved

• moq-mux / hang: FLAC (feat(moq-mux): add FLAC support (catalog + mp4/mkv import/export) #1969), MP3 for FLV and MKV/GStreamer (feat(moq-mux): add MP3 audio support for FLV/RTMP #1967, feat(moq-mux,moq-gst): MP3 support for MKV and GStreamer #1970), Opus over MPEG-TS (feat(moq-mux): Opus audio over MPEG-TS (import + export) #1965), select::Broadcast rendition selection (replaces dev's catalog::Filter/Target), fMP4 zero-duration fix (Fix fMP4 zero-duration samples #1933), discontinuity sequence through fMP4 import (moq-hls: preserve discontinuity sequence through fMP4 import #1945), codec/container correctness fixes (fix(moq-mux): codec/container correctness fixes from #1918 review (#1923) #1925).
• moq-cli: unified endpoint grammar with the binary renamed to moq (moq-cli: unified endpoint grammar (binary renamed to moq) #1985), --cors-origin ([codex] configure moq-cli CORS origins #1996), per-sink --latency-max (feat(moq-cli): per-sink frame-drop latency for the export gateways #1998), HLS import routed through moq-hls ([codex] Route HLS CLI import through moq-hls #1939). Dev's capture stack, H.264/H.265 elementary sinks, and rendition-selection flags (--video-name/--video-codec/--audio-name/--audio-codec) were ported onto the new grammar.
• moq-rtmp / moq-srt / moq-rtc: library-only conversion (moq-rtmp/srt/rtc: convert to library-only crates #1975), client dial-out roles (moq-rtmp/moq-srt: add client (dial-out) role #1982), ICE-timeout abort (moq-rtc: abort sessions that never receive ICE candidates #1951), valid rejected m-line in SDP answers (moq-rtc: emit a valid rejected m-line in SDP answers #1964), exposed session runner ([codex] expose moq-rtc session runner #1931).
• moq-native / moq-relay: unified client TLS verification with the OS platform verifier (feat(moq-native): unified client TLS verification + quiche backend support #1902, fix(moq-native): verify server certs with the OS platform verifier #1968), client TLS reuse for outbound auth HTTP (feat(moq-relay): reuse client TLS for outbound auth HTTP; make --client-tls-* flags consistent #1901), internal listener folded into --server-bind (Fold the internal listener into --server-bind (one authenticated accept path) #1974), HTTPS cert arrays ([codex] support relay HTTPS cert arrays #1932). Dev's noq-default backend and composable web router kept.
• moq-net: announcement byte-usage stats (moq-net: track announcement byte usage in stats #1953) ported onto dev's arbitrary tier labels. Main's feat(moq-net): moq-lite-05 SETUP message + PATH parameter #1954/feat(moq-net): hook up the rest of moq-lite-05 wire (TRACK_INFO, SUBSCRIBE_END, frame timestamps) #1963 lite-05 hunks were backports of dev's own work and were superseded.
• moq-json / js: DEFLATE extraction into moq-flate/@moq/flate (feat(flate): extract group-scoped DEFLATE into moq-flate / @moq/flate #1905), diffing serializer (perf(moq-json): generate merge patches with a diffing serializer (+ benchmark) #1912), compressed-budget delta gating (refactor(moq-json): gate group rolls on already-written deltas #1909); @moq/qmux 0.1.3 reconnect fix (fix(js/net): bump @moq/qmux to 0.1.3 to fix reconnect hang #1957, withoutProtocol replaced by the requireProtocol default); watch reload defaults to enabled ([codex] default watch reload to enabled #1984).

Deliberate drops (flagged for review)

• Dev's --video-width-max/--video-height-max/--video-pixels-max/--video-bitrate-max/--audio-bitrate-max CLI flags: main's moq-mux: API cleanup before the semver bump #1941 deleted the catalog::Target soft-matching API they rode on, so there is no surviving library surface. Can be re-added if targets return.
• Main's leading-/ SETUP path validation from feat(moq-net): moq-lite-05 SETUP message + PATH parameter #1954: not ported because dev exposes the raw path via Request::path() and stricter validation could break UDS ?path= callers. Say the word if you want it enforced on dev.
• --internal-tier: gone with the [internal] listener fold (Fold the internal listener into --server-bind (one authenticated accept path) #1974); tier now comes from the auth layer (--auth-mtls-tier / auth API tier). Docs updated.
• hang::Catalog::compressed_track() (main-only helper): removed; it used the pre-reshape moq_net::Track type and had no callers. COMPRESSED_NAME + default_track_info() cover its use.

CI fixes made along the way

• moq-net SETUP regression (the big one): the merge initially ported main's behavior of closing the session when the uni SETUP-stream send fails. On dev's protocol that send is best-effort (a failure just means the peer treats us as having no capabilities), and on the qmux/WebSocket transport it can fail benignly. Closing on it turned a tolerable transient into a fatal connection closed: 4, severing every WebSocket/TCP session right after version negotiation. This broke the moq-native broadcast_websocket* and moq-relay internal_tcp_* tests and every rust/python publisher leg of the smoke matrix. Reverted to dev's best-effort behavior; lite/session.rs is now byte-identical to dev.
• bun.lock regenerated to match the merged package.json set.
• deny.toml: ignore the fresh quick-xml RUSTSEC-2026-0194/0195 (unreachable fix: plist pins quick-xml 0.39; only parses local macOS config via netdev), drop the dead bincode ignore.
• moq-cli: the stdin/capture pipeline now runs on the main task (the platform capture stream is not Send, so Publish::run cannot ride the JoinSet under --all-features).
• moq-mux: doc links repointed from the removed Filter/Target to Stream::select.
• flake.nix: restored cargo-nextest (main added it with the justfile's nextest switch; the auto-merge dropped it).
• smoke harness: the Python client now awaits the async subscribe_media (feat(moq-ffi)!: defer dynamic track accept so media tracks declare a timescale #1761 made it a coroutine; fix(smoke): update interop clients to the current dev APIs #1952 fixed only subscribe_catalog); the C client link gets -lstdc++ -lva -lva-drm for the openh264/vaapi objects in libmoq.a; publisher + relay logs are dumped on failure.

Verification

• cargo check --workspace --all-targets, cargo clippy -D warnings, cargo doc -D warnings, cargo fmt/sort pass locally (excluding moq-video's nvenc/vaapi defaults and moq-gst, which need CUDA/libva/GStreamer system libs absent in the sandbox; moq-video --no-default-features and the capture-feature moq-cli build pass).
• The WebSocket/TCP nextest cases and the libmoq session test need IPv6, which the sandbox lacks ([::]:0 won't bind), so they were verified by root-causing against CI plus the byte-for-byte revert to dev; CI has IPv6 and exercises them.
• bun run check passes for all JS packages including the demo; bun test passes 454/454.
• rust→rust smoke passes locally end to end (relay + ffmpeg + moq import avc3 / moq export fmp4).
• The nvidia-video-codec-sdk git patch entry is intentionally absent from Cargo.lock, matching dev's state (the fork is unreachable from the sandbox).

Cross-package sync

Docs updated alongside code: doc/bin/cli.md (new moq grammar), doc/bin/relay/config.md (--server-bind fold, tier flags), doc/concept/layer/hang.md, doc/lib/rs/crate/moq-mux.md, rs/CLAUDE.md (crate map: moq-cli/moq-rtc roles), demo/pub/justfile. The swift/kt/go/py wrappers had no conflicting changes; note that main's #1978 (TLS system root control in moq-ffi) shipped without wrapper/doc updates on main, so that gap predates this merge.

(Written by Claude Fable 5)

[sourcery-ai]

Sorry, we are unable to review this pull request

The GitHub API does not allow us to fetch diffs exceeding 20000 lines