openrtc 1.0.4

OpenRTC: a Rust-first P2P runtime for device discovery, signaling, and iroh/QUIC networking.
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
#![cfg(all(not(target_arch = "wasm32"), feature = "transport-moq"))]

use std::collections::HashMap;
use std::sync::atomic::{AtomicBool, AtomicU8, Ordering};
use std::sync::Arc;
use std::time::Duration;

use anyhow::{anyhow, bail, ensure, Context, Result};
use bytes::Bytes;
use moq_transport::coding::TrackNamespace;
use moq_transport::serve::{self, TrackReaderMode};
use tokio::sync::{Mutex, RwLock};

use super::{NativeMoQMessageHandler, NativeMoQState, NativeMoQTerminalHandler};

#[cfg(feature = "test-harness")]
pub mod test_relay;

const MOQ_SETUP_TIMEOUT: Duration = Duration::from_secs(10);
const MOQ_SUBSCRIBE_RETRY_DELAY: Duration = Duration::from_millis(250);
const MOQ_MAX_OBJECT_PAYLOAD_BYTES: usize = 4 * 1024 * 1024;
const MOQ_MAX_ACCESS_TOKEN_BYTES: usize = 16 * 1024;
const MOQ_BROADCAST_TRACK: &str = "data/broadcast";

type Draft14TrackWriters = HashMap<String, serve::SubgroupsWriter>;

/// Native Draft 14 MoQ wire adapter.
///
/// The OpenRTC peer-session actor remains the lifecycle decision owner. This
/// adapter owns only one relay session and its route-local publish/subscribe
/// mechanics, then reports readiness and protected payloads to that owner.
#[derive(Clone)]
pub struct NativeMoQSession {
    local_node_id: String,
    remote_node_id: String,
    relay_url: String,
    access_token: Option<String>,
    state: Arc<AtomicU8>,
    started: Arc<AtomicBool>,
    endpoint_client: Arc<Mutex<Option<moq_native_ietf::quic::Client>>>,
    outbound_tracks: Arc<Mutex<Draft14TrackWriters>>,
    tasks: Arc<Mutex<Vec<tokio::task::JoinHandle<()>>>>,
    message_handler: Arc<RwLock<Option<NativeMoQMessageHandler>>>,
    terminal_handler: Arc<RwLock<Option<NativeMoQTerminalHandler>>>,
    pending_messages: Arc<Mutex<Vec<Bytes>>>,
}

impl NativeMoQSession {
    pub async fn new(
        local_node_id: &str,
        remote_node_id: &str,
        config: &crate::client::MoQConfig,
    ) -> Result<Self> {
        let relay_url = config.relay_url.trim();
        ensure!(!relay_url.is_empty(), "moq relay_url is required");
        ensure!(
            relay_url.starts_with("https://"),
            "moq relay_url must use https/WebTransport"
        );
        ensure!(
            !relay_url.contains('#'),
            "moq relay_url must not contain a fragment"
        );
        ensure!(
            !relay_url_has_jwt_query(relay_url),
            "moq relay_url must not contain a jwt query parameter; use access_token"
        );

        let access_token = config
            .access_token
            .as_deref()
            .map(str::trim)
            .map(str::to_string);
        if let Some(token) = access_token.as_deref() {
            ensure!(!token.is_empty(), "moq access_token must not be empty");
            ensure!(
                token.len() <= MOQ_MAX_ACCESS_TOKEN_BYTES,
                "moq access_token exceeds the maximum supported size"
            );
            ensure!(
                token
                    .bytes()
                    .all(|byte| byte.is_ascii_alphanumeric() || matches!(byte, b'-' | b'_' | b'.')),
                "moq access_token must be a URL-safe JWT"
            );
        }

        Ok(Self {
            local_node_id: local_node_id.to_string(),
            remote_node_id: remote_node_id.to_string(),
            relay_url: relay_url.to_string(),
            access_token,
            state: Arc::new(AtomicU8::new(0)),
            started: Arc::new(AtomicBool::new(false)),
            endpoint_client: Arc::new(Mutex::new(None)),
            outbound_tracks: Arc::new(Mutex::new(HashMap::new())),
            tasks: Arc::new(Mutex::new(Vec::new())),
            message_handler: Arc::new(RwLock::new(None)),
            terminal_handler: Arc::new(RwLock::new(None)),
            pending_messages: Arc::new(Mutex::new(Vec::new())),
        })
    }

    pub fn state(&self) -> NativeMoQState {
        decode_state(self.state.load(Ordering::SeqCst))
    }

    #[cfg(test)]
    pub(crate) fn force_state_for_test(&self, state: NativeMoQState) {
        self.state.store(encode_state(state), Ordering::SeqCst);
    }

    pub async fn start(&self) -> Result<()> {
        if self.started.swap(true, Ordering::SeqCst) {
            return Ok(());
        }
        self.state.store(1, Ordering::SeqCst);
        if self.relay_url.contains(".invalid") {
            self.state.store(3, Ordering::SeqCst);
            bail!(
                "moq relay is unreachable: {}",
                relay_diagnostic_label(&self.relay_url)
            );
        }

        let setup = tokio::time::timeout(MOQ_SETUP_TIMEOUT, self.connect_draft14()).await;
        let (client, session, publisher, subscriber) = match setup {
            Ok(Ok(connected)) => connected,
            Ok(Err(error)) => {
                self.state.store(3, Ordering::SeqCst);
                return Err(error);
            }
            Err(_) => {
                self.state.store(3, Ordering::SeqCst);
                bail!(
                    "MoQ Draft 14 setup timed out after {} ms",
                    MOQ_SETUP_TIMEOUT.as_millis()
                );
            }
        };

        *self.endpoint_client.lock().await = Some(client);
        self.state.store(2, Ordering::SeqCst);

        self.spawn_session_driver(session).await;
        self.spawn_publisher(publisher).await;
        self.spawn_subscription(subscriber.clone(), self.direct_inbound_track_name())
            .await;
        self.spawn_subscription(subscriber, MOQ_BROADCAST_TRACK.to_string())
            .await;
        Ok(())
    }

    pub async fn send(&self, data: &[u8]) -> Result<()> {
        ensure!(
            self.state() == NativeMoQState::Connected,
            "native moq session is not started"
        );
        ensure!(
            data.len() <= MOQ_MAX_OBJECT_PAYLOAD_BYTES,
            "native moq object payload too large: {}",
            data.len()
        );

        let track_name = self.direct_outbound_track_name();
        let mut tracks = self.outbound_tracks.lock().await;
        let Some(track) = tracks.get_mut(&track_name) else {
            bail!("native moq track is not subscribed yet; caller must fall back to iroh");
        };
        let mut subgroup = track
            .append(0)
            .context("failed to create MoQ Draft 14 subgroup")?;
        subgroup
            .write(Bytes::copy_from_slice(data))
            .context("failed to write MoQ Draft 14 object")?;
        Ok(())
    }

    pub async fn is_peer_data_subscribed(&self) -> bool {
        self.outbound_tracks
            .lock()
            .await
            .contains_key(&self.direct_outbound_track_name())
    }

    pub async fn wait_for_peer_data_subscription(&self, timeout: Duration) -> bool {
        tokio::time::timeout(timeout, async {
            loop {
                if self.is_peer_data_subscribed().await {
                    return true;
                }
                if self.state() != NativeMoQState::Connected {
                    return false;
                }
                tokio::time::sleep(Duration::from_millis(25)).await;
            }
        })
        .await
        .unwrap_or(false)
    }

    pub async fn close_gracefully(&self) {
        self.state.store(4, Ordering::SeqCst);
        self.outbound_tracks.lock().await.clear();
        let tasks = self.tasks.lock().await.drain(..).collect::<Vec<_>>();
        for task in &tasks {
            task.abort();
        }
        // Await cancellation so the publisher future is actually dropped before
        // a replacement session announces the same durable node namespace.
        // Dropping a JoinHandle alone detaches its task and leaks the announce.
        for task in tasks {
            let _ = task.await;
        }
        self.endpoint_client.lock().await.take();
    }

    pub fn close(&self) {
        self.state.store(4, Ordering::SeqCst);
        let session = self.clone();
        tokio::spawn(async move {
            session.close_gracefully().await;
        });
    }

    pub async fn set_message_handler(&self, handler: NativeMoQMessageHandler) {
        *self.message_handler.write().await = Some(handler.clone());
        let pending = {
            let mut guard = self.pending_messages.lock().await;
            std::mem::take(&mut *guard)
        };
        for message in pending {
            handler(message).await;
        }
    }

    pub async fn set_terminal_handler(&self, handler: NativeMoQTerminalHandler) {
        *self.terminal_handler.write().await = Some(handler);
    }

    #[cfg(feature = "test-harness")]
    pub async fn force_failure_for_test(&self) -> bool {
        if !mark_failed_unless_closed(&self.state) {
            return false;
        }
        self.outbound_tracks.lock().await.clear();
        let tasks = self.tasks.lock().await.drain(..).collect::<Vec<_>>();
        for task in &tasks {
            task.abort();
        }
        for task in tasks {
            let _ = task.await;
        }
        self.endpoint_client.lock().await.take();
        self.notify_terminal_failure().await;
        true
    }

    async fn connect_draft14(
        &self,
    ) -> Result<(
        moq_native_ietf::quic::Client,
        moq_transport::session::Session,
        moq_transport::session::Publisher,
        moq_transport::session::Subscriber,
    )> {
        let connection_url = relay_connection_url(&self.relay_url, self.access_token.as_deref());
        let url = connection_url
            .parse::<url::Url>()
            .context("invalid MoQ relay URL")?;
        let tls = moq_native_ietf::tls::Args {
            disable_verify: relay_url_uses_loopback_host(&self.relay_url),
            ..Default::default()
        }
        .load()
        .context("failed to configure MoQ TLS")?;
        let quic = moq_native_ietf::quic::Args {
            tls: moq_native_ietf::tls::Args {
                disable_verify: relay_url_uses_loopback_host(&self.relay_url),
                ..Default::default()
            },
            ..Default::default()
        }
        .load()
        .or_else(|_| {
            moq_native_ietf::quic::Config::new(
                "0.0.0.0:0".parse().expect("valid fallback bind address"),
                None,
                tls,
            )
        })
        .context("failed to configure MoQ QUIC")?;
        let endpoint = moq_native_ietf::quic::Endpoint::new(quic)
            .context("failed to create MoQ Draft 14 endpoint")?;
        let client = endpoint.client;
        let relay_label = relay_diagnostic_label(&self.relay_url);
        let (webtransport, _, transport) = client.connect(&url, None).await.map_err(|error| {
            anyhow!(
                "failed to connect MoQ Draft 14 relay {relay_label}: {}",
                redact_access_token(&error.to_string(), self.access_token.as_deref())
            )
        })?;
        let (session, publisher, subscriber) =
            moq_transport::session::Session::connect(webtransport, None, transport)
                .await
                .context("MoQ Draft 14 SETUP exchange failed")?;
        Ok((client, session, publisher, subscriber))
    }

    async fn spawn_session_driver(&self, session: moq_transport::session::Session) {
        let state = self.state.clone();
        let terminal_handler = self.terminal_handler.clone();
        self.push_task(tokio::spawn(async move {
            if let Err(error) = session.run().await {
                eprintln!("[NativeMoQ] Draft 14 session failed: {error:#}");
            }
            if mark_failed_unless_closed(&state) {
                notify_terminal_failure(&terminal_handler).await;
            }
        }))
        .await;
    }

    async fn spawn_publisher(&self, mut publisher: moq_transport::session::Publisher) {
        let namespace = TrackNamespace::from_utf8_path(&self.local_node_id);
        let (_tracks_writer, mut requests, tracks_reader) = serve::Tracks::new(namespace).produce();
        let allowed_direct = self.direct_outbound_track_name();
        let outbound_tracks = self.outbound_tracks.clone();
        let state = self.state.clone();
        let terminal_handler = self.terminal_handler.clone();
        self.push_task(tokio::spawn(async move {
            let announce = publisher.announce(tracks_reader);
            tokio::pin!(announce);
            loop {
                tokio::select! {
                    result = &mut announce => {
                        match result {
                            Ok(()) => {}
                            Err(error) => eprintln!("[NativeMoQ] Draft 14 announce failed: {error:#}"),
                        }
                        if mark_failed_unless_closed(&state) {
                            notify_terminal_failure(&terminal_handler).await;
                        }
                        return;
                    }
                    requested = requests.next() => {
                        let Some(track) = requested else {
                            if mark_failed_unless_closed(&state) {
                                notify_terminal_failure(&terminal_handler).await;
                            }
                            return;
                        };
                        let name = track.name.clone();
                        if name != allowed_direct && name != MOQ_BROADCAST_TRACK {
                            let _ = track.close(serve::ServeError::NotFound);
                            continue;
                        }
                        match track.subgroups() {
                            Ok(writer) => {
                                outbound_tracks.lock().await.insert(name, writer);
                            }
                            Err(error) => {
                                eprintln!("[NativeMoQ] failed to serve Draft 14 track: {error}");
                            }
                        }
                    }
                }
            }
        }))
        .await;
    }

    async fn spawn_subscription(
        &self,
        subscriber: moq_transport::session::Subscriber,
        track_name: String,
    ) {
        let namespace = TrackNamespace::from_utf8_path(&self.remote_node_id);
        let state = self.state.clone();
        let message_handler = self.message_handler.clone();
        let pending_messages = self.pending_messages.clone();
        self.push_task(tokio::spawn(async move {
            while decode_state(state.load(Ordering::SeqCst)) == NativeMoQState::Connected {
                let (track_writer, track_reader) =
                    serve::Track::new(namespace.clone(), track_name.clone()).produce();
                let mut subscriber = subscriber.clone();
                match subscriber.subscribe_open(track_writer).await {
                    Ok(subscription) => {
                        let result = receive_track(
                            track_reader,
                            message_handler.clone(),
                            pending_messages.clone(),
                        )
                        .await;
                        drop(subscription);
                        if let Err(error) = result {
                            eprintln!(
                                "[NativeMoQ] Draft 14 subscription {track_name} ended: {error:#}"
                            );
                        }
                    }
                    Err(error) => {
                        eprintln!(
                            "[NativeMoQ] Draft 14 subscription {track_name} not ready: {error}"
                        );
                    }
                }
                if decode_state(state.load(Ordering::SeqCst)) != NativeMoQState::Connected {
                    return;
                }
                tokio::time::sleep(MOQ_SUBSCRIBE_RETRY_DELAY).await;
            }
        }))
        .await;
    }

    async fn push_task(&self, task: tokio::task::JoinHandle<()>) {
        self.tasks.lock().await.push(task);
    }

    async fn notify_terminal_failure(&self) {
        notify_terminal_failure(&self.terminal_handler).await;
    }

    fn direct_outbound_track_name(&self) -> String {
        format!("data / {} ", self.remote_node_id)
    }

    fn direct_inbound_track_name(&self) -> String {
        format!("data / {} ", self.local_node_id)
    }
}

async fn receive_track(
    track: serve::TrackReader,
    message_handler: Arc<RwLock<Option<NativeMoQMessageHandler>>>,
    pending_messages: Arc<Mutex<Vec<Bytes>>>,
) -> Result<()> {
    let TrackReaderMode::Subgroups(mut groups) = track.mode().await? else {
        bail!("MoQ Draft 14 peer selected an unsupported track mode");
    };
    while let Some(mut group) = groups.next().await? {
        while let Some(payload) = group.read_next().await? {
            ensure!(
                payload.len() <= MOQ_MAX_OBJECT_PAYLOAD_BYTES,
                "native moq object payload too large: {}",
                payload.len()
            );
            dispatch_or_buffer_message(&message_handler, &pending_messages, payload).await;
        }
    }
    Ok(())
}

async fn dispatch_or_buffer_message(
    message_handler: &Arc<RwLock<Option<NativeMoQMessageHandler>>>,
    pending_messages: &Arc<Mutex<Vec<Bytes>>>,
    payload: Bytes,
) {
    let handler = message_handler.read().await.clone();
    if let Some(handler) = handler {
        handler(payload).await;
    } else {
        pending_messages.lock().await.push(payload);
    }
}

fn mark_failed_unless_closed(state: &AtomicU8) -> bool {
    loop {
        let current = state.load(Ordering::SeqCst);
        match decode_state(current) {
            NativeMoQState::Closed | NativeMoQState::Failed => return false,
            NativeMoQState::Idle | NativeMoQState::Connecting | NativeMoQState::Connected => {
                if state
                    .compare_exchange(current, 3, Ordering::SeqCst, Ordering::SeqCst)
                    .is_ok()
                {
                    return true;
                }
            }
        }
    }
}

async fn notify_terminal_failure(terminal_handler: &Arc<RwLock<Option<NativeMoQTerminalHandler>>>) {
    if let Some(handler) = terminal_handler.read().await.clone() {
        handler().await;
    }
}

#[cfg(test)]
fn encode_state(state: NativeMoQState) -> u8 {
    match state {
        NativeMoQState::Idle => 0,
        NativeMoQState::Connecting => 1,
        NativeMoQState::Connected => 2,
        NativeMoQState::Failed => 3,
        NativeMoQState::Closed => 4,
    }
}

fn decode_state(state: u8) -> NativeMoQState {
    match state {
        1 => NativeMoQState::Connecting,
        2 => NativeMoQState::Connected,
        3 => NativeMoQState::Failed,
        4 => NativeMoQState::Closed,
        _ => NativeMoQState::Idle,
    }
}

fn relay_url_uses_loopback_host(relay_url: &str) -> bool {
    relay_url.starts_with("https://localhost")
        || relay_url.starts_with("https://127.")
        || relay_url.starts_with("https://[::1]")
}

fn relay_url_has_jwt_query(relay_url: &str) -> bool {
    relay_url
        .split_once('?')
        .map(|(_, query)| {
            query
                .split('&')
                .map(|pair| pair.split_once('=').map_or(pair, |(key, _)| key))
                .any(|key| key.eq_ignore_ascii_case("jwt"))
        })
        .unwrap_or(false)
}

fn relay_connection_url(relay_url: &str, access_token: Option<&str>) -> String {
    let Some(token) = access_token else {
        return relay_url.to_string();
    };
    let separator = if relay_url.contains('?') { '&' } else { '?' };
    format!("{relay_url}{separator}jwt={token}")
}

fn relay_diagnostic_label(relay_url: &str) -> &str {
    relay_url
        .split_once('?')
        .map_or(relay_url, |(base, _)| base)
}

fn redact_access_token(value: &str, access_token: Option<&str>) -> String {
    let Some(token) = access_token else {
        return value.to_string();
    };
    value.replace(token, "[redacted]")
}

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

    fn make_config(relay_url: &str) -> MoQConfig {
        MoQConfig {
            relay_url: relay_url.to_string(),
            access_token: None,
        }
    }

    #[tokio::test]
    async fn invalid_relay_url_reaches_failed() {
        let session =
            NativeMoQSession::new("local", "remote", &make_config("https://relay.invalid/moq"))
                .await
                .unwrap();
        assert!(session.start().await.is_err());
        assert_eq!(session.state(), NativeMoQState::Failed);
    }

    #[tokio::test]
    async fn send_requires_connected_and_subscribed_route() {
        let session = NativeMoQSession::new(
            "local",
            "remote",
            &make_config("https://relay.example.com/moq"),
        )
        .await
        .unwrap();
        let error = session.send(b"hello").await.unwrap_err();
        assert!(error.to_string().contains("not started"));

        session.force_state_for_test(NativeMoQState::Connected);
        let error = session.send(b"hello").await.unwrap_err();
        assert!(error.to_string().contains("not subscribed"));
    }

    #[tokio::test]
    async fn close_reaches_closed_state() {
        let session = NativeMoQSession::new(
            "local",
            "remote",
            &make_config("https://relay.example.com/moq"),
        )
        .await
        .unwrap();
        session.close_gracefully().await;
        assert_eq!(session.state(), NativeMoQState::Closed);
    }

    #[cfg(feature = "test-harness")]
    #[tokio::test]
    async fn draft14_local_relay_carries_bilateral_native_payloads() {
        let probe = std::net::UdpSocket::bind("127.0.0.1:0").unwrap();
        let port = probe.local_addr().unwrap().port();
        drop(probe);
        let relay = tokio::spawn(async move {
            let _ = test_relay::run(port).await;
        });
        tokio::time::sleep(Duration::from_millis(100)).await;

        let config = make_config(&format!("https://localhost:{port}/moq"));
        let left = NativeMoQSession::new("left", "right", &config)
            .await
            .unwrap();
        let right = NativeMoQSession::new("right", "left", &config)
            .await
            .unwrap();
        left.start().await.unwrap();
        right.start().await.unwrap();

        assert!(
            left.wait_for_peer_data_subscription(Duration::from_secs(5))
                .await
        );
        assert!(
            right
                .wait_for_peer_data_subscription(Duration::from_secs(5))
                .await
        );

        let (left_tx, left_rx) = tokio::sync::oneshot::channel::<Bytes>();
        let left_tx = Arc::new(Mutex::new(Some(left_tx)));
        left.set_message_handler(Arc::new(move |payload| {
            let left_tx = left_tx.clone();
            Box::pin(async move {
                if let Some(tx) = left_tx.lock().await.take() {
                    let _ = tx.send(payload);
                }
            })
        }))
        .await;
        let (right_tx, right_rx) = tokio::sync::oneshot::channel::<Bytes>();
        let right_tx = Arc::new(Mutex::new(Some(right_tx)));
        right
            .set_message_handler(Arc::new(move |payload| {
                let right_tx = right_tx.clone();
                Box::pin(async move {
                    if let Some(tx) = right_tx.lock().await.take() {
                        let _ = tx.send(payload);
                    }
                })
            }))
            .await;

        left.send(b"left-to-right").await.unwrap();
        right.send(b"right-to-left").await.unwrap();
        assert_eq!(
            tokio::time::timeout(Duration::from_secs(3), right_rx)
                .await
                .unwrap()
                .unwrap(),
            Bytes::from_static(b"left-to-right")
        );
        assert_eq!(
            tokio::time::timeout(Duration::from_secs(3), left_rx)
                .await
                .unwrap()
                .unwrap(),
            Bytes::from_static(b"right-to-left")
        );

        left.close_gracefully().await;
        right.close_gracefully().await;
        relay.abort();
    }

    #[cfg(feature = "test-harness")]
    #[tokio::test]
    async fn draft14_replacement_releases_the_previous_node_namespace() {
        let probe = std::net::UdpSocket::bind("127.0.0.1:0").unwrap();
        let port = probe.local_addr().unwrap().port();
        drop(probe);
        let relay = tokio::spawn(async move {
            let _ = test_relay::run(port).await;
        });
        tokio::time::sleep(Duration::from_millis(100)).await;

        let config = make_config(&format!("https://localhost:{port}/moq"));
        let first_left = NativeMoQSession::new("left", "right", &config)
            .await
            .unwrap();
        let right = NativeMoQSession::new("right", "left", &config)
            .await
            .unwrap();
        first_left.start().await.unwrap();
        right.start().await.unwrap();
        assert!(
            first_left
                .wait_for_peer_data_subscription(Duration::from_secs(5))
                .await
        );
        assert!(
            right
                .wait_for_peer_data_subscription(Duration::from_secs(5))
                .await
        );

        first_left.close_gracefully().await;
        let replacement_left = NativeMoQSession::new("left", "right", &config)
            .await
            .unwrap();
        replacement_left.start().await.unwrap();

        assert!(
            replacement_left
                .wait_for_peer_data_subscription(Duration::from_secs(5))
                .await,
            "replacement publisher never became data-ready"
        );
        assert!(
            right
                .wait_for_peer_data_subscription(Duration::from_secs(5))
                .await,
            "existing peer did not resubscribe to the replacement publisher"
        );

        let (received_tx, received_rx) = tokio::sync::oneshot::channel::<Bytes>();
        let received_tx = Arc::new(Mutex::new(Some(received_tx)));
        right
            .set_message_handler(Arc::new(move |payload| {
                let received_tx = received_tx.clone();
                Box::pin(async move {
                    if let Some(tx) = received_tx.lock().await.take() {
                        let _ = tx.send(payload);
                    }
                })
            }))
            .await;
        replacement_left.send(b"replacement-payload").await.unwrap();
        assert_eq!(
            tokio::time::timeout(Duration::from_secs(3), received_rx)
                .await
                .unwrap()
                .unwrap(),
            Bytes::from_static(b"replacement-payload")
        );

        replacement_left.close_gracefully().await;
        right.close_gracefully().await;
        relay.abort();
    }

    #[test]
    fn access_token_is_connection_only_and_redacted() {
        let token = "header.payload.signature";
        let relay_url = "https://relay.example.com/moq?existing=value";
        assert_eq!(
            relay_connection_url(relay_url, Some(token)),
            format!("{relay_url}&jwt={token}")
        );
        assert_eq!(
            relay_diagnostic_label(relay_url),
            "https://relay.example.com/moq"
        );
        assert_eq!(
            redact_access_token(
                &format!("failed to connect https://relay.example.com/moq?jwt={token}"),
                Some(token),
            ),
            "failed to connect https://relay.example.com/moq?jwt=[redacted]"
        );
    }

    #[tokio::test]
    async fn inline_jwt_and_non_url_safe_tokens_are_rejected() {
        let inline = make_config("https://relay.example.com/moq?jwt=secret");
        let error = NativeMoQSession::new("local", "remote", &inline)
            .await
            .err()
            .expect("inline JWT must be rejected");
        assert!(error.to_string().contains("use access_token"));

        let invalid = MoQConfig {
            relay_url: "https://relay.example.com/moq".to_string(),
            access_token: Some("not a jwt&leak".to_string()),
        };
        let error = NativeMoQSession::new("local", "remote", &invalid)
            .await
            .err()
            .expect("unsafe token must be rejected");
        assert!(error.to_string().contains("URL-safe JWT"));
    }
}