huddle-protocol 2.1.1

The Huddle wire protocol and pure cryptographic constructions — the runtime-free core that both the huddle client and relay speak.
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
//! Wire protocol for room discovery and message broadcast.
//!
//! Two gossipsub topics:
//!   - `ROOMS_TOPIC` — global, every node subscribes. Used for room
//!     advertisements (so all peers see "rooms in this network").
//!   - `format!("{ROOM_TOPIC_PREFIX}{room_id}")` — per-room. Only members
//!     of a room subscribe. All room messages flow here.

use serde::{Deserialize, Serialize};
use sha2::{Digest, Sha256};

// huddle 2.0.4 (WS1.1): `RoomKind` and `EncryptedFileMeta` are part of the wire
// surface (`RoomAnnouncement.kind`, `FileOffer.encrypted_meta`), so they live
// here in `huddle-protocol`. `huddle-core` re-exports both from their original
// module paths (`storage::repo::RoomKind`, `files::encryption::EncryptedFileMeta`)
// so existing call sites are unchanged. Serde representation is byte-identical.

/// huddle 0.7: explicit room kind. `Direct` = 1-1 DM (encrypted, no name, no
/// member-list chrome, no kick/grant). `Group` = N-way room (full moderation,
/// named, optionally encrypted). Persisted on `rooms.kind` and echoed on
/// `RoomAnnouncement.kind` (with `#[serde(default)]` so pre-0.7 peers'
/// announcements deserialize as `Group`).
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "snake_case")]
pub enum RoomKind {
    Direct,
    #[default]
    Group,
}

impl RoomKind {
    pub fn as_str(&self) -> &'static str {
        match self {
            RoomKind::Direct => "direct",
            RoomKind::Group => "group",
        }
    }

    pub fn from_str(s: &str) -> Self {
        match s {
            "direct" => RoomKind::Direct,
            _ => RoomKind::Group,
        }
    }
}

/// Metadata for an encrypted file transfer, carried in `FileOffer`. The
/// ChaCha20-Poly1305 file key is Megolm-wrapped (`wrapped_key_b64`); the
/// `content_hash` is bound as AEAD associated data.
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
pub struct EncryptedFileMeta {
    pub megolm_session_id: String,
    pub wrapped_key_b64: String,
    pub nonce_b64: String,
    /// SHA-256 of the plaintext, hex-encoded. Bound as AEAD associated
    /// data so the (key, nonce, ciphertext) triple can't be replayed
    /// against different content, and verified after decryption.
    pub content_hash: String,
}

pub const ROOMS_TOPIC: &str = "huddle-rooms-v1";
pub const ROOM_TOPIC_PREFIX: &str = "huddle-room-";

pub fn room_topic(room_id: &str) -> String {
    format!("{ROOM_TOPIC_PREFIX}{room_id}")
}

/// huddle 1.0: a stable, per-identity "inbox" room id for relay-routed
/// contact requests — `inbox:<hex(sha256("huddle-inbox-v1" || fingerprint))>`.
/// Lets "add by HD-ID" work over the internet (not just the LAN mesh): the
/// requester publishes a signed `ContactRequest` here and the owner, who
/// auto-subscribes to their own inbox, picks it up (live or from the relay
/// mailbox). The relay only ever sees this hash, never the raw fingerprint
/// (preimage resistance), so it can't reconstruct a contact graph; the
/// `inbox:` prefix + distinct salt keep it from colliding with DM / group
/// room ids. Both sides derive the same id from the target fingerprint.
pub fn inbox_room_id(fingerprint: &str) -> String {
    let mut h = Sha256::new();
    h.update(b"huddle-inbox-v1");
    h.update(fingerprint.as_bytes());
    format!("inbox:{}", hex::encode(h.finalize()))
}

/// Application-level signed envelope around a `RoomMessage`. Used for
/// any message whose authenticity matters beyond gossipsub's transport-
/// level signing.
///
/// The following variants MUST be sent inside a `Signed` envelope, and
/// receivers MUST drop them when they arrive unsigned:
///   - `MemberLeave` (signer must equal the claimed `sender_fingerprint`;
///     huddle 0.7.11 — closes the unsigned-leave spoof bug)
///   - `MemberAnnounce` (signer must equal the claimed `sender_fingerprint`;
///     huddle 0.7.11 — closes the TOFU-pubkey hijack bug)
///   - `FileOffer` (signer must equal the claimed `sender_fingerprint`;
///     huddle 0.7.11 — prevents attribution spoofing)
///   - `RotateRoomKey` (signer must equal the claimed `rotator_fingerprint`)
///   - `OwnerGrant`, `BanMember` (signer must be a current room owner)
///   - `SasInit`, `SasResponse`, `SasConfirm` (SAS handshake — signature
///     binds the ephemeral X25519 pubkey to the sender's identity)
///   - `CodeJoinRequest`, `CodeJoinResponse` (signer is the joiner /
///     owner)
///   - `JoinRefused` (signer is a room owner; tells the rejected joiner
///     it really came from the room)
///   - `ProfileUpdate` (signer must equal the claimed `sender_fingerprint`;
///     prevents anyone from spoofing another peer's username)
///   - `ContactRequest` (signer must equal the claimed `requester_fingerprint`;
///     huddle 1.0 — the signature proves who's asking to connect)
///   - `Reaction`, `Edit`, `Delete` (huddle 2.0 / F10 — signer must equal
///     the claimed `sender_fingerprint`; edits & deletes are additionally
///     applied only when the signer is the original sender OR a current
///     room owner)
///   - `RoomSetting` (huddle 2.0 / F9 — disappearing-messages TTL; the
///     signer must be the room creator or a current owner)
///
/// Verification happens via `crate::crypto::verify_signed`: it re-derives
/// the fingerprint from `ed25519_pubkey_b64`, asserts equality with
/// `fingerprint`, runs `Ed25519::verify_strict` over the decoded
/// `payload_b64`, and rejects envelopes whose `signed_at_ms` falls
/// outside a ±5 min window from now (replay protection).
///
/// Format choice: payload is base64'd serialized `RoomMessage` JSON
/// (not the JSON bytes directly) so the envelope itself is plain JSON
/// without escaping nightmares.
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
pub struct SignedRoomMessage {
    pub fingerprint: String,
    pub ed25519_pubkey_b64: String,
    pub payload_b64: String,
    pub signature_b64: String,
    /// huddle 0.7.11: epoch-ms timestamp the sender bound into the
    /// signature, used by receivers as replay protection. `#[serde(default)]`
    /// for forward-compat parsing — but the verifier rejects `0` and
    /// values outside the configured window, so legacy pre-0.7.11 senders
    /// no longer satisfy `verify_signed`.
    #[serde(default)]
    pub signed_at_ms: i64,
    /// huddle 2.0.6 (WS2-a): optional **composite ML-DSA-65 post-quantum
    /// signature**. When the hybrid path is used, the same `signed_bytes`
    /// (payload || domain || timestamp) are signed with the sender's ML-DSA-65
    /// key too; `mldsa_pubkey_b64` carries that key. A verifier that has
    /// **pinned** the sender's ML-DSA key (learned from a prior signed announce,
    /// like the ML-KEM pin) checks this signature via
    /// [`crate::crypto::verify_signed_mldsa`], so a quantum adversary that forges
    /// the Ed25519 signature still cannot forge the envelope. Both fields are
    /// absent on classical envelopes — byte-identical to pre-2.0.6 — and ignored
    /// by older peers.
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub mldsa_pubkey_b64: Option<String>,
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub mldsa_signature_b64: Option<String>,
}

/// What actually gets serialized onto a per-room gossipsub topic. New
/// in v0.3.0 — previously, the raw `RoomMessage` JSON went on the wire.
/// All outgoing messages now flow through this envelope so the receiver
/// can tell signed from unsigned at the outer layer without trial-
/// parsing. Tagged so future variants don't silently misparse.
#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(tag = "type", content = "data", rename_all = "snake_case")]
pub enum WireMessage {
    /// Unsigned — equivalent to the old wire format. Used for messages
    /// whose authenticity isn't security-critical: `Plain`, `Typing`,
    /// `FileChunk`, etc. NOTE: `MemberAnnounce` moved to the **signed**
    /// envelope in 0.7.11 (see `broadcast_member_announce`), so its
    /// fingerprint pin can't be hijacked — and, as of 1.3, so its
    /// ML-KEM key + ciphertext can't be stripped by a relay to force a
    /// post-quantum downgrade without breaking the signature.
    Plain(RoomMessage),
    /// App-level Ed25519-signed envelope.
    Signed(SignedRoomMessage),
}

/// Serialize an unsigned `RoomMessage` to its on-wire bytes inside the
/// new `WireMessage::Plain` envelope. The single helper keeps every send
/// site in `app/mod.rs` from open-coding the wrap.
pub fn encode_wire(msg: &RoomMessage) -> serde_json::Result<Vec<u8>> {
    serde_json::to_vec(&WireMessage::Plain(msg.clone()))
}

/// Serialize a `SignedRoomMessage` envelope to its on-wire bytes.
pub fn encode_wire_signed(env: &SignedRoomMessage) -> serde_json::Result<Vec<u8>> {
    serde_json::to_vec(&WireMessage::Signed(env.clone()))
}

/// Broadcast on the global ROOMS_TOPIC. Each peer republishes the rooms
/// they're currently in, periodically. Listeners maintain a cache with TTL.
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct RoomAnnouncement {
    pub room_id: String,
    pub name: String,
    pub encrypted: bool,
    /// Argon2id salt — present iff `encrypted`. Joiners derive their
    /// passphrase key from (passphrase, salt) to unwrap session keys.
    pub passphrase_salt: Option<Vec<u8>>,
    pub member_count: u32,
    pub creator_fingerprint: String,
    /// Seconds since UNIX_EPOCH when this announcement was emitted.
    pub announced_at: i64,
    /// Phase B: fingerprints with role = 'owner' — the soft moderator
    /// set. Newcomers learn from this who's authorized to grant other
    /// owners and to issue bans (signed via `SignedRoomMessage`).
    /// `#[serde(default)]` for forward-compat with pre-0.3 senders.
    #[serde(default)]
    pub owner_fingerprints: Vec<String>,
    /// Phase E: when true, existing members refuse to wrap their
    /// session key for a joiner whose fingerprint isn't in the
    /// global `verified_peers` set. Joiner sees a `JoinRefused`
    /// reply from at least one owner so the UX isn't a silent hang.
    /// `#[serde(default)]` so pre-0.3 senders default to permissive.
    #[serde(default)]
    pub verified_only: bool,
    /// Phase D follow-up: dialable multiaddrs of the announcing node.
    /// Populated from AutoNAT-confirmed external addresses + relay
    /// circuit reservations (capped at 4 entries to keep the
    /// announcement small). Empty for pre-0.3-followup senders.
    ///
    /// Consumer: when a peer sees an announcement with non-empty
    /// `host_addrs` and isn't already connected to `creator_fingerprint`,
    /// it opportunistically dials the first entry. This lets cross-
    /// internet peers bootstrap via relay-circuit addresses without
    /// requiring an invite link.
    #[serde(default)]
    pub host_addrs: Vec<String>,
    /// huddle 0.7: explicit room kind. `RoomKind::Direct` (1-1 DM) is
    /// filtered out by honest 0.7+ consumers if neither member is them —
    /// DMs never leak past the two participants' sidebars. Pre-0.7
    /// peers omit the field, which `#[serde(default)]` resolves to
    /// `RoomKind::Group` (`Default` impl) — they keep working unchanged.
    #[serde(default)]
    pub kind: RoomKind,
}

/// All messages on a room's per-room topic.
#[derive(Debug, Clone, Serialize, Deserialize)]
pub enum RoomMessage {
    /// Announce my presence in the room. For encrypted rooms, also share
    /// my Megolm session key (passphrase-wrapped).
    MemberAnnounce {
        sender_fingerprint: String,
        /// base64(nonce || chacha20poly1305_ciphertext) of the Megolm
        /// SessionKey, encrypted under the passphrase-derived key.
        /// None for unencrypted rooms.
        wrapped_session_key: Option<String>,
        /// Optional human-readable display name. Serde defaults to
        /// `None` for forward compat with older peers.
        #[serde(default)]
        display_name: Option<String>,
        /// Base64 of the sender's 32-byte Ed25519 public key. Lets every
        /// existing member learn the new member's pubkey on first contact,
        /// so they can verify future `SignedRoomMessage` envelopes from
        /// this fingerprint. `#[serde(default)]` for forward compat: a
        /// pre-0.3.0 peer that doesn't send this still works, but its
        /// signed messages can't be verified until it re-announces.
        #[serde(default)]
        sender_ed25519_pubkey: Option<String>,
        /// huddle 1.3: base64 of the sender's 1184-byte ML-KEM-768
        /// encapsulation (public) key, for hybrid post-quantum DM key
        /// agreement. Populated only on **Direct** room announces. Its
        /// presence is how the peer signals PQ capability: a DM goes hybrid
        /// iff the partner published this (or we have it pinned from a prior
        /// announce — see `app::ensure_dm_key`). `#[serde(default,
        /// skip_serializing_if = "Option::is_none")]` keeps pre-1.3 peers (and
        /// all group announces) byte-compatible — when `None` the field simply
        /// doesn't appear, and a missing field decodes back to `None`. (Do NOT
        /// "simplify" this to serde's bare `skip`: that would drop the field on
        /// the wire unconditionally and silently disable the whole PQ path.)
        /// Carried inside the *signed* `MemberAnnounce` envelope, so the relay
        /// can't strip it to force a downgrade without breaking the signature.
        #[serde(default, skip_serializing_if = "Option::is_none")]
        sender_mlkem_pubkey: Option<String>,
        /// huddle 1.3: base64 of the 1088-byte ML-KEM-768 ciphertext sent by
        /// the DM **initiator** (the lower-fingerprint peer) to the responder,
        /// who decapsulates it to recover the shared post-quantum secret. Only
        /// the initiator sets this; the responder's announces omit it.
        #[serde(default, skip_serializing_if = "Option::is_none")]
        mlkem_ciphertext: Option<String>,
    },
    /// A request from a recently-joined member: "I need session keys".
    /// Existing members respond with MemberAnnounce.
    SessionKeyRequest { requester_fingerprint: String },
    /// An encrypted message in an encrypted room.
    Encrypted {
        sender_fingerprint: String,
        session_id: String,
        /// base64-encoded MegolmMessage bytes
        ciphertext_b64: String,
        /// huddle 2.0 (F10): sender-minted stable id for this message, used
        /// as the cross-peer targeting key for reactions, edits, replies and
        /// deletes. `#[serde(default, skip_serializing_if = "Option::is_none")]`
        /// keeps pre-2.0 peers byte-compatible: when `None` the field is
        /// omitted on the wire, and a missing field decodes back to `None`
        /// (so messages from older peers simply can't be a content-affordance
        /// target — content still flows).
        #[serde(default, skip_serializing_if = "Option::is_none")]
        client_msg_id: Option<String>,
        /// huddle 2.0 (F10): `client_msg_id` of the message this one replies
        /// to, if any. `None` (and omitted on the wire) for top-level messages
        /// and pre-2.0 senders.
        #[serde(default, skip_serializing_if = "Option::is_none")]
        reply_to: Option<String>,
    },
    /// A plaintext message in an unencrypted room.
    Plain {
        sender_fingerprint: String,
        body: String,
        /// huddle 2.0 (F10): see `Encrypted::client_msg_id`. Sender-minted
        /// stable id; `#[serde(default, skip_serializing_if = "Option::is_none")]`
        /// for byte-compat with pre-2.0 peers.
        #[serde(default, skip_serializing_if = "Option::is_none")]
        client_msg_id: Option<String>,
        /// huddle 2.0 (F10): `client_msg_id` of the message this one replies
        /// to, if any. `None` for top-level messages and pre-2.0 senders.
        #[serde(default, skip_serializing_if = "Option::is_none")]
        reply_to: Option<String>,
    },
    /// Explicit leave notification.
    MemberLeave {
        sender_fingerprint: String,
        /// huddle 2.0.3 (audit N-M2): the room this leave is for. The Ed25519
        /// signature commits to the payload but NOT the gossip topic, so without
        /// this a malicious relay could replay a signed leave from room A onto
        /// room B's topic. `Option` + `skip_serializing_if` keeps the wire
        /// byte-identical to pre-2.0.3 when unset (graceful back-compat); honest
        /// receivers cross-check it against the delivery topic when present.
        #[serde(default, skip_serializing_if = "Option::is_none")]
        room_id: Option<String>,
    },
    /// "I'm rotating the room key — derive a new passphrase key from
    /// `new_salt` + the new passphrase you'll be told out-of-band, then
    /// wait for my MemberAnnounce." Phase 3 v1: simplistic — only the
    /// rotator's outbound changes; receivers must opt in by entering
    /// the new passphrase to decrypt new wrapped session keys.
    RotateRoomKey {
        rotator_fingerprint: String,
        /// Argon2id salt for the new passphrase-derived key.
        new_salt: Vec<u8>,
        /// huddle 2.0.3 (audit N-M2): the room being rotated, cross-checked
        /// against the delivery topic so a signed rotation can't be replayed
        /// into another room. Optional for pre-2.0.3 back-compat.
        #[serde(default, skip_serializing_if = "Option::is_none")]
        room_id: Option<String>,
    },
    /// Ephemeral "I'm typing" signal. TTL on the receive side is 3s.
    Typing { sender_fingerprint: String },
    /// Announce a file the sender is about to push. The receiver creates
    /// an attachment row (status=offered) and waits for chunks. For
    /// encrypted rooms `encrypted_meta` carries the Megolm-wrapped file
    /// key + ChaCha20 nonce.
    FileOffer {
        sender_fingerprint: String,
        file_id: String,
        name: String,
        size_bytes: u64,
        mime: Option<String>,
        chunk_count: u32,
        encrypted_meta: Option<EncryptedFileMeta>,
    },
    /// One chunk of an in-flight file. Receivers reassemble by index
    /// and verify the final SHA-256 against `file_id`.
    FileChunk {
        sender_fingerprint: String,
        file_id: String,
        chunk_index: u32,
        total_chunks: u32,
        /// base64 of raw chunk bytes (plaintext bytes for unencrypted
        /// rooms, ChaCha20-Poly1305 ciphertext for encrypted).
        data_b64: String,
    },
    /// Phase B: an existing owner promotes `target_fingerprint` to
    /// owner. MUST be sent inside `WireMessage::Signed` — the signer
    /// must be on the room's current `owner_fingerprints` list for
    /// honest receivers to apply the change.
    OwnerGrant {
        room_id: String,
        target_fingerprint: String,
    },
    /// Phase B: an existing owner bans `target_fingerprint` from the
    /// room. MUST be sent inside `WireMessage::Signed`. Honest clients
    /// then ignore the banned fingerprint's MemberAnnounce + messages.
    /// The cryptographic enforcement is the immediate `RotateRoomKey`
    /// that the banning owner sends right after.
    BanMember {
        room_id: String,
        target_fingerprint: String,
    },
    /// Phase G: SAS verification step 1. The initiator picks a random
    /// `tx_id` and an ephemeral X25519 keypair, sends the pubkey.
    /// MUST be sent inside `WireMessage::Signed` so the receiver can
    /// bind this ephemeral key to the initiator's Ed25519 identity.
    SasInit {
        tx_id: String,
        ephemeral_x25519_pubkey_b64: String,
        target_fingerprint: String,
    },
    /// Phase G: SAS step 2 — responder's ephemeral X25519 pubkey.
    /// Both sides now have what they need to compute the shared
    /// secret and derive the SAS code locally. Signed.
    SasResponse {
        tx_id: String,
        ephemeral_x25519_pubkey_b64: String,
    },
    /// Phase G: SAS step 3 — once both sides have OOB-compared the
    /// derived code and pressed "Match", each broadcasts this. On
    /// receiving the partner's `matched=true`, the local side flips
    /// `verified=1` for the partner's fingerprint. Signed.
    SasConfirm { tx_id: String, matched: bool },
    /// Phase E: an existing owner of a `verified_only` room is
    /// telling `target_fingerprint` (an unverified joiner) why their
    /// announce went unanswered. Replaces a silent hang on the
    /// joiner's side. Signed.
    JoinRefused {
        room_id: String,
        target_fingerprint: String,
        reason: String,
    },
    /// Phase F: a joiner is asking to enter a room using a short-lived
    /// owner-issued code (no passphrase). Includes the joiner's
    /// ephemeral X25519 pubkey for ECDH key delivery. Signed (so the
    /// owner knows who's asking).
    CodeJoinRequest {
        room_id: String,
        joiner_x25519_pubkey_b64: String,
        code: String,
    },
    /// Phase F: an issuing owner's response to a valid `CodeJoinRequest`.
    /// Carries the owner's ephemeral X25519 pubkey + the current Megolm
    /// session key wrapped under the ECDH-derived key. Joiner does
    /// X25519 the other direction, derives the same wrap key, unwraps
    /// the session key. Signed.
    CodeJoinResponse {
        room_id: String,
        target_fingerprint: String,
        owner_x25519_pubkey_b64: String,
        owner_session_id: String,
        wrapped_session_key_b64: String,
        nonce_b64: String,
    },
    /// Phase 0.5: a peer is announcing (or clearing) their self-declared
    /// username. MUST be sent inside `WireMessage::Signed` — receivers
    /// require `verified_signer == sender_fingerprint`. Last-write-wins
    /// by `updated_at` (monotonic ms). `username = None` clears the
    /// previously-set username and the peer renders as `[anonymous]`.
    ProfileUpdate {
        sender_fingerprint: String,
        username: Option<String>,
        updated_at: i64,
    },
    /// huddle 1.0: a contact/DM request delivered to the target's relay
    /// inbox (`inbox_room_id`). MUST be sent inside `WireMessage::Signed` —
    /// the signer's fingerprint IS the requester's identity (the whole
    /// point: it proves who's asking). Carries the requester's Ed25519
    /// pubkey so the recipient can TOFU-pin it and later derive the DM ECDH
    /// key without a round-trip.
    ContactRequest {
        requester_fingerprint: String,
        #[serde(default)]
        display_name: Option<String>,
        #[serde(default)]
        note: Option<String>,
        #[serde(default)]
        sender_ed25519_pubkey: Option<String>,
    },
    /// huddle 2.0 (F10): add or remove an emoji reaction on another message
    /// in this room. MUST be sent inside `WireMessage::Signed` — the signer
    /// must equal `sender_fingerprint`; honest receivers drop unsigned
    /// reactions (like `FileOffer` / `MemberAnnounce`). The toggle unit is
    /// one emoji per (sender, target message): `removed = false` adds the
    /// reaction, `removed = true` clears it. A brand-new variant, so pre-2.0
    /// peers never produce it and ignore it on receipt.
    Reaction {
        sender_fingerprint: String,
        /// `client_msg_id` of the message being reacted to (must exist in
        /// this room for honest receivers to apply the reaction).
        target_msg_id: String,
        /// A single emoji or short custom code (e.g. "+1", "laugh").
        emoji: String,
        /// `false` = add the reaction, `true` = remove it (toggle off).
        /// `#[serde(default)]` so a missing field decodes to `false` (add).
        #[serde(default)]
        removed: bool,
    },
    /// huddle 2.0 (F10): edit the body of an existing message. MUST be sent
    /// inside `WireMessage::Signed`; honest receivers apply it only when the
    /// signer is the original sender OR a current room owner (moderation).
    /// Last-write-wins. For encrypted rooms the replacement body rides as a
    /// fresh Megolm ciphertext in `new_ciphertext_b64` (decrypted exactly
    /// like an `Encrypted` body, against the carried `session_id`); for
    /// plaintext rooms it rides as `new_body`.
    Edit {
        sender_fingerprint: String,
        /// `client_msg_id` of the message being edited.
        target_msg_id: String,
        /// base64 MegolmMessage bytes of the replacement body, for encrypted
        /// rooms. Empty for plaintext rooms (which carry the new body in
        /// `new_body` instead).
        new_ciphertext_b64: String,
        /// huddle 2.0 (F10): the Megolm `session_id` the editor encrypted
        /// `new_ciphertext_b64` under, so receivers decrypt the edit against
        /// the correct session — exactly like `Encrypted::session_id` — with
        /// no reliance on an in-memory "last inbound session" guess (which
        /// failed after a session rotation, after restart, from a second
        /// device, or before any other message on the session). Empty (and
        /// omitted on the wire) for plaintext rooms. `#[serde(default,
        /// skip_serializing_if = "String::is_empty")]` keeps it additive: a
        /// pre-session-id edit decodes to an empty string and is dropped
        /// gracefully rather than mis-decrypted.
        #[serde(default, skip_serializing_if = "String::is_empty")]
        session_id: String,
        /// Replacement plaintext body, for unencrypted rooms. `None` (and
        /// omitted on the wire) for encrypted rooms, whose new body lives in
        /// `new_ciphertext_b64`.
        #[serde(default, skip_serializing_if = "Option::is_none")]
        new_body: Option<String>,
    },
    /// huddle 2.0 (F10): delete (tombstone) an existing message. MUST be
    /// sent inside `WireMessage::Signed`; honest receivers apply it only when
    /// the signer is the original sender OR a current room owner. Idempotent —
    /// the original message row is kept and a tombstone is recorded, so the
    /// body renders as "[deleted]" everywhere.
    Delete {
        sender_fingerprint: String,
        /// `client_msg_id` of the message being deleted.
        target_msg_id: String,
    },
    /// huddle 2.0 (F9): a signed control message that sets this room's
    /// disappearing-messages TTL. MUST be sent inside `WireMessage::Signed` —
    /// honest receivers apply it only when the signer is the room creator or a
    /// current owner. `disappearing_ttl_secs = 0` turns expiry off; any value
    /// > 0 makes each peer locally auto-delete messages that many seconds
    /// after they were stored. Pre-2.0 peers ignore the unknown variant and
    /// never expire their local copies (graceful downgrade).
    RoomSetting {
        sender_fingerprint: String,
        disappearing_ttl_secs: u64,
        /// huddle 2.0.3 (audit N-M2): the room this setting applies to. Without
        /// it a malicious relay could replay a signed disappearing-TTL from one
        /// room (where the signer is an owner) onto another room they also own,
        /// forcing a retroactive history purge there (chains L-24). Cross-checked
        /// against the delivery topic on receive. Optional for back-compat.
        #[serde(default, skip_serializing_if = "Option::is_none")]
        room_id: Option<String>,
    },

    // huddle 2.1 (WS2-b): MLS (RFC 9420) group messaging — the post-quantum-ready
    // group layer. These variants carry the MLS handshake + application traffic
    // for rooms that opt into MLS, so classical Megolm rooms are unaffected. All
    // are ADDITIVE: a pre-2.1 peer drops the unknown variant gracefully (the
    // payload fails to deserialize and is logged + dropped), so MLS and classical
    // peers coexist. Commit ordering rides the relay's per-room `seq` (huddle
    // 2.0.8). Payloads are opaque TLS-serialized MLS objects, so this crate stays
    // runtime-free — the MLS engine lives in `huddle-core` behind its `mls`
    // feature; see PROTOCOL.md §11 and the rollout spec.
    /// A member publishes its MLS `KeyPackage` so existing members can add it to
    /// the group.
    MlsKeyPackage {
        sender_fingerprint: String,
        /// base64 TLS-serialized MLS `KeyPackage`.
        key_package_b64: String,
    },
    /// A `Welcome` hands a freshly-added member the group's secrets. MUST be
    /// `WireMessage::Signed`; directed at one new member.
    MlsWelcome {
        target_fingerprint: String,
        /// base64 TLS-serialized MLS `Welcome`.
        welcome_b64: String,
    },
    /// A `Commit` advances the group's epoch (add / remove / update). MUST be
    /// `WireMessage::Signed`; applied in the relay's per-room `seq` order so every
    /// member converges on the same epoch sequence — TreeKEM forward secrecy,
    /// post-compromise security, and cryptographically-enforced removal.
    MlsCommit {
        sender_fingerprint: String,
        /// base64 TLS-serialized MLS handshake `MlsMessage` (a Commit).
        commit_b64: String,
    },
    /// An MLS-encrypted application (chat) message under the current epoch key.
    MlsApplication {
        sender_fingerprint: String,
        /// base64 TLS-serialized MLS application `MlsMessage`.
        ciphertext_b64: String,
    },
}

#[cfg(test)]
mod tests {
    use super::*;

    #[test]
    fn room_announcement_round_trip() {
        let ann = RoomAnnouncement {
            room_id: "rid".into(),
            name: "general".into(),
            encrypted: true,
            passphrase_salt: Some(vec![1, 2, 3, 4]),
            member_count: 3,
            creator_fingerprint: "creator-fp".into(),
            announced_at: 100,
            owner_fingerprints: vec!["creator-fp".into()],
            verified_only: false,
            host_addrs: vec![],
            kind: RoomKind::Group,
        };
        let json = serde_json::to_vec(&ann).unwrap();
        let back: RoomAnnouncement = serde_json::from_slice(&json).unwrap();
        assert_eq!(back.name, "general");
        assert_eq!(back.passphrase_salt, Some(vec![1, 2, 3, 4]));
        assert_eq!(back.kind, RoomKind::Group);
    }

    #[test]
    fn room_announcement_direct_kind_round_trip() {
        let ann = RoomAnnouncement {
            room_id: "dm-rid".into(),
            name: "dm".into(),
            encrypted: false,
            passphrase_salt: None,
            member_count: 2,
            creator_fingerprint: "alice-fp".into(),
            announced_at: 100,
            owner_fingerprints: vec![],
            verified_only: false,
            host_addrs: vec![],
            kind: RoomKind::Direct,
        };
        let json = serde_json::to_vec(&ann).unwrap();
        let back: RoomAnnouncement = serde_json::from_slice(&json).unwrap();
        assert_eq!(back.kind, RoomKind::Direct);
    }

    #[test]
    fn room_announcement_missing_kind_defaults_to_group() {
        // Simulates a pre-0.7 peer's announcement: same JSON shape
        // without the `kind` field. The serde(default) attribute on the
        // field must resolve to RoomKind::Group so older peers keep
        // working unchanged.
        let pre_0_7_json = serde_json::json!({
            "room_id": "rid",
            "name": "general",
            "encrypted": false,
            "passphrase_salt": null,
            "member_count": 1,
            "creator_fingerprint": "creator-fp",
            "announced_at": 100,
        });
        let back: RoomAnnouncement = serde_json::from_value(pre_0_7_json).unwrap();
        assert_eq!(back.kind, RoomKind::Group);
    }

    #[test]
    fn room_message_variants_round_trip() {
        let msgs = vec![
            RoomMessage::MemberAnnounce {
                sender_fingerprint: "fp".into(),
                wrapped_session_key: Some("base64data".into()),
                display_name: Some("Daisy".into()),
                sender_ed25519_pubkey: Some("AAA=".into()),
                sender_mlkem_pubkey: Some("BBB=".into()),
                mlkem_ciphertext: Some("CCC=".into()),
            },
            RoomMessage::Plain {
                sender_fingerprint: "fp".into(),
                body: "hi".into(),
                client_msg_id: Some("cmid-1".into()),
                reply_to: None,
            },
            RoomMessage::Encrypted {
                sender_fingerprint: "fp".into(),
                session_id: "sid".into(),
                ciphertext_b64: "ct".into(),
                client_msg_id: Some("cmid-2".into()),
                reply_to: Some("cmid-1".into()),
            },
            RoomMessage::SessionKeyRequest {
                requester_fingerprint: "fp".into(),
            },
            RoomMessage::MemberLeave {
                sender_fingerprint: "fp".into(),
                room_id: None,
            },
            RoomMessage::FileOffer {
                sender_fingerprint: "fp".into(),
                file_id: "fid".into(),
                name: "f.bin".into(),
                size_bytes: 1024,
                mime: Some("application/octet-stream".into()),
                chunk_count: 2,
                encrypted_meta: None,
            },
            RoomMessage::FileChunk {
                sender_fingerprint: "fp".into(),
                file_id: "fid".into(),
                chunk_index: 0,
                total_chunks: 2,
                data_b64: "AAA=".into(),
            },
            RoomMessage::RotateRoomKey {
                rotator_fingerprint: "fp".into(),
                new_salt: vec![1u8; 16],
                room_id: None,
            },
            RoomMessage::Typing {
                sender_fingerprint: "fp".into(),
            },
            // huddle 2.0 (F10/F9): new content + control variants.
            RoomMessage::Reaction {
                sender_fingerprint: "fp".into(),
                target_msg_id: "cmid-1".into(),
                emoji: "👍".into(),
                removed: false,
            },
            RoomMessage::Edit {
                sender_fingerprint: "fp".into(),
                target_msg_id: "cmid-1".into(),
                new_ciphertext_b64: "ct2".into(),
                session_id: "sid".into(),
                new_body: None,
            },
            RoomMessage::Edit {
                sender_fingerprint: "fp".into(),
                target_msg_id: "cmid-1".into(),
                new_ciphertext_b64: String::new(),
                session_id: String::new(),
                new_body: Some("edited body".into()),
            },
            RoomMessage::Delete {
                sender_fingerprint: "fp".into(),
                target_msg_id: "cmid-1".into(),
            },
            RoomMessage::RoomSetting {
                sender_fingerprint: "fp".into(),
                disappearing_ttl_secs: 3600,
                room_id: None,
            },
        ];
        for m in msgs {
            let json = serde_json::to_vec(&m).unwrap();
            let back: RoomMessage = serde_json::from_slice(&json).unwrap();
            assert_eq!(format!("{m:?}"), format!("{back:?}"));
        }
    }

    #[test]
    fn plain_without_new_fields_defaults_to_none() {
        // Simulates a pre-2.0 peer's Plain message: externally-tagged JSON
        // with no `client_msg_id` / `reply_to`. The serde(default) attrs must
        // resolve both to `None` so old senders keep working unchanged.
        let pre_2_0_json = serde_json::json!({
            "Plain": {
                "sender_fingerprint": "fp",
                "body": "hi",
            }
        });
        let back: RoomMessage = serde_json::from_value(pre_2_0_json).unwrap();
        match back {
            RoomMessage::Plain {
                client_msg_id,
                reply_to,
                ..
            } => {
                assert_eq!(client_msg_id, None);
                assert_eq!(reply_to, None);
            }
            other => panic!("expected Plain, got {other:?}"),
        }
    }

    #[test]
    fn plain_with_none_ids_omits_fields_on_wire() {
        // skip_serializing_if must keep the wire bytes byte-compatible with
        // pre-2.0 peers when the new fields are absent.
        let m = RoomMessage::Plain {
            sender_fingerprint: "fp".into(),
            body: "hi".into(),
            client_msg_id: None,
            reply_to: None,
        };
        let v = serde_json::to_value(&m).unwrap();
        let inner = &v["Plain"];
        assert!(inner.get("client_msg_id").is_none());
        assert!(inner.get("reply_to").is_none());
    }

    #[test]
    fn reaction_missing_removed_defaults_to_false() {
        // `removed` carries serde(default) so a peer that omits it (an "add"
        // reaction) decodes to `false`.
        let json = serde_json::json!({
            "Reaction": {
                "sender_fingerprint": "fp",
                "target_msg_id": "cmid-1",
                "emoji": "❤️",
            }
        });
        let back: RoomMessage = serde_json::from_value(json).unwrap();
        match back {
            RoomMessage::Reaction { removed, emoji, .. } => {
                assert!(!removed);
                assert_eq!(emoji, "❤️");
            }
            other => panic!("expected Reaction, got {other:?}"),
        }
    }

    #[test]
    fn edit_missing_session_id_defaults_to_empty() {
        // huddle 2.0.0 (F10): an `Edit` minted before `session_id` was added
        // to the wire must decode to an empty `session_id` (graceful drop on
        // the receive side) rather than fail to parse.
        let json = serde_json::json!({
            "Edit": {
                "sender_fingerprint": "fp",
                "target_msg_id": "cmid-1",
                "new_ciphertext_b64": "ct2",
            }
        });
        let back: RoomMessage = serde_json::from_value(json).unwrap();
        match back {
            RoomMessage::Edit { session_id, .. } => assert_eq!(session_id, ""),
            other => panic!("expected Edit, got {other:?}"),
        }
    }

    #[test]
    fn edit_empty_session_id_omitted_on_wire() {
        // A plaintext-room edit has no session; `skip_serializing_if` keeps
        // those wire bytes free of an empty `session_id`. The encrypted-room
        // edit, by contrast, always carries one.
        let plain = RoomMessage::Edit {
            sender_fingerprint: "fp".into(),
            target_msg_id: "cmid-1".into(),
            new_ciphertext_b64: String::new(),
            session_id: String::new(),
            new_body: Some("edited".into()),
        };
        let v = serde_json::to_value(&plain).unwrap();
        assert!(v["Edit"].get("session_id").is_none());

        let enc = RoomMessage::Edit {
            sender_fingerprint: "fp".into(),
            target_msg_id: "cmid-1".into(),
            new_ciphertext_b64: "ct2".into(),
            session_id: "sid".into(),
            new_body: None,
        };
        let v = serde_json::to_value(&enc).unwrap();
        assert_eq!(v["Edit"]["session_id"], "sid");
    }

    #[test]
    fn room_topic_format() {
        assert_eq!(room_topic("abc123"), "huddle-room-abc123");
    }
}