Merge main into dev#1814
Merged
Merged
Conversation
Co-authored-by: moq-bot[bot] <186640430+moq-bot[bot]@users.noreply.github.com>
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
Co-authored-by: Luke Curley <kixelated@gmail.com> Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
…7.3 (#1790) Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
…1792) Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
Co-authored-by: moq-bot[bot] <186640430+moq-bot[bot]@users.noreply.github.com>
… aarch64-linux (#1793) Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
#1806) Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
Bring main's recent fixes onto dev. Most of main's commits since the last sync were already present on dev (latency-range playback, relay credential-expiry close, moq_json command routing, peer_identity), so the net new content is: - CI: adopt main's crane-based Rust checks (clippy/doc/test via `nix flake check`), replacing dev's per-runner CARGO_TARGET_DIR scheme (#1801). - moq-native: combine main's session-flap backoff (#1806) with dev's reconnect session-state tracking. Conflicts resolved in favor of dev's newer moq-net API and input/output signal structure; main's overlapping changes were the same features in the older shape. Removed a duplicate PeerIdentity block that auto-merge concatenated in tls.rs. Regenerated Cargo.lock. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Brings
main(up to 9cf11cc) ontodevvia a merge commit.Most of main's commits since the last sync were already present on
dev(latency-range playback, relay credential-expiry close, moq_json command routing,peer_identity), so the net new content is small:nix flake check), replacing dev's per-runnerCARGO_TARGET_DIRscheme (#1801). Main's nix overlay is already moq-video-aware.Conflict resolution
16 files conflicted. The consistent pattern: dev is ahead of main and already carried main's recent features, just expressed through dev's newer
moq-netAPI andinput/outputsignal structure.js/watch/*,js/moq-boy, and the Rust API-rename conflicts (connection.rs,tests/backend.rs,moq-boy/input.rs) → kept dev's side; main's hunks were the same features in the older shape (e.g. dev'sconnection.rsalready has the full credential-expiry timeout logic from Add universal build for macos (needed for obs-studio) #855).check.yml,rs/justfile→ took main's side (crane CI supersedes dev's target-dir approach).reconnect.rs→ manually combined both sides.Cargo.lock→ regenerated against the merged manifest.One auto-merge landmine:
tls.rsmerged cleanly but textually duplicated the entirePeerIdentityblock (both branches added it), which only failed undercargo test. Removed the duplicate.Verified
origin/mainis now fully an ancestor of the merge result (nothing dropped).Test plan
cargo check --workspace --all-targetscleancargo test -p moq-native— 62/62 pass (covers the reconnect combine + tls dedup)js/watchunit tests — 78/78 pass (covers the sync.test.ts conflict)bun run --filter='*' check)(Written by Claude)