Skip to content

Merge main into feat/054-connector-boundary - #285

Merged
lxsaah merged 3 commits into
feat/054-connector-boundaryfrom
chore/054-merge-main
Oct 4, 2026
Merged

lxsaah merged 3 commits into
feat/054-connector-boundaryfrom
chore/054-merge-main

Conversation

@lxsaah

@lxsaah lxsaah commented Oct 4, 2026

Copy link
Copy Markdown
Contributor

Brings main into the 054 feature branch before stage 9 starts. main adds only #284 (Maximum Packet Size in the embedded CONNECT, with its changelog entries). Please merge with a merge commit, not a squash, so main's commit stays in the feature branch's history.

Commits

  1. Merge main into feat/054-connector-boundary. The only conflict was two constants added at the same place in session_loop.rs: PUBACK_ROOM (from feat(mqtt): encode embedded packets into one bbqueue write ring (design 054 §4.7) #283) and MAX_INBOUND_PACKET (from fix(mqtt): advertise Maximum Packet Size in the embedded CONNECT #284). Both are kept. The CONNECT block merged cleanly and now has TopicAliasMaximum(0) and MaximumPacketSize(3328), written through ring.put(&connect, 0).
  2. test(mqtt): drop the retained-message proofs now covered by tokio_broker.

The test files and changelogs from main are unchanged against main.

Verification

Suite Passed
embedded-tls lib (includes #284's alignment test and the session-size test with the second CONNECT property) 42
write_ring_proofs 1
session_loop 6
tokio_broker 4
embassy_broker 1
tls_session 3
tls_broker 3
backend_parity 8
--features std 40
  • Every aimdb-mqtt-connector clippy leg from the Makefile (host, test targets, thumbv7em) and cargo fmt --all --check: clean.
  • embassy-mqtt-connector-demo and weather-station-gamma build for thumbv8m.main-none-eabihf.
  • CI does not run on PRs into feat/054-connector-boundary.

🤖 Generated with Claude Code

lxsaah and others added 3 commits October 4, 2026 21:08
Brings #284 (Maximum Packet Size in the embedded CONNECT). The only
conflict was two constants added at the same place in session_loop.rs
(PUBACK_ROOM here, MAX_INBOUND_PACKET from main); both are kept. The
CONNECT block merged cleanly: ring.put plus the new property.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
With main's Maximum Packet Size fix the fake broker withholds a push over
the client's limit, so the 4,000-byte reconnect-loop proof no longer holds.
a_retained_message_over_the_maximum_packet_size_is_withheld covers both the
3,000-byte and the 4,000-byte case.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@lxsaah
lxsaah merged commit a11813a into feat/054-connector-boundary Oct 4, 2026
2 checks passed
@lxsaah
lxsaah deleted the chore/054-merge-main branch October 4, 2026 19:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant