test: run CONTROL lifecycle tests on the virtual network

Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
VallierDevandClaude Opus 5.5 committed 2026-10-17 14:27:41 +08:00
1 parent 25edc41b9f
commit e5bb214f99
4 files changed
+26 -7

No files matched your search

+8 -3
View File
@@ -9,14 +9,16 @@ struct Viewer {
pc: Arc<RTCPeerConnection>,
channels: HashMap<String, Arc<RTCDataChannel>>,
messages: Messages,
router: Arc<Mutex<webrtc::util::vnet::router::Router>>,
}
async fn connect(input: Arc<InputInjector>, desktop: bool,
portal: Option<Arc<crate::desktop_session::PortalDesktop>>, labels: &[&str]) -> (WebRtcSession, Viewer) {
let (host_setting, viewer_setting, router) = crate::test_network::virtual_network().await;
let screen = Arc::new(ScreenCapture::unavailable("synthetic locked desktop".into()));
let host = WebRtcSession::new(screen, input, crate::signaling::SignalingClient::disconnected(),
desktop, crate::session_ice::SessionIce::local(), portal).await.unwrap();
let pc = Arc::new(APIBuilder::new().build().new_peer_connection(RTCConfiguration::default()).await.unwrap());
desktop, crate::session_ice::SessionIce::virtual_net(host_setting), portal).await.unwrap();
let pc = Arc::new(APIBuilder::new().with_setting_engine(viewer_setting).build().new_peer_connection(RTCConfiguration::default()).await.unwrap());
let (tx, messages) = mpsc::unbounded_channel();
let mut channels = HashMap::new();
for label in labels {
@@ -41,7 +43,7 @@ async fn connect(input: Arc<InputInjector>, desktop: bool,
tokio::time::sleep(Duration::from_millis(20)).await;
}
}).await.expect("local SCTP channels did not open");
(host, Viewer { pc, channels, messages })
(host, Viewer { pc, channels, messages, router })
}
fn body(message: &[u8], number: u32) -> Option<&[u8]> {
@@ -206,6 +208,9 @@ async fn locked_control_unlock_requests_and_tools_work_without_a_video_frame() {
terminal_viewer.pc.close().await.unwrap();
file_viewer.pc.close().await.unwrap();
port_viewer.pc.close().await.unwrap();
for router in [&viewer.router, &terminal_viewer.router, &file_viewer.router, &port_viewer.router] {
router.lock().await.stop().await.unwrap();
}
echo.abort();
drop(lock);
}).await.expect("locked bootstrap/tool regression exceeded deadline");
+8 -1
View File
@@ -7,13 +7,20 @@ use webrtc::peer_connection::{configuration::RTCConfiguration,policy::ice_transp
pub struct SessionIce {
servers: Vec<RTCIceServer>,
relay_only: bool,
#[cfg(test)]
pub(crate) setting_engine: Option<webrtc::api::setting_engine::SettingEngine>,
}
impl SessionIce {
#[cfg(test)]
pub fn local() -> Self {
// A supplied empty URL list disables the public STUN defaults in local peer tests.
Self { servers: vec![RTCIceServer::default()], relay_only: false }
Self { servers: vec![RTCIceServer::default()], ..Default::default() }
}
#[cfg(test)]
pub fn virtual_net(setting_engine: webrtc::api::setting_engine::SettingEngine) -> Self {
Self { setting_engine: Some(setting_engine), ..Self::local() }
}
pub fn from_header(header:&Value)->Self {
+2
View File
@@ -78,6 +78,8 @@ impl WebRtcSession {
webrtc::interceptor::registry::Registry::new(), &mut m,
).map_err(|e| format!("Register RTP/RTCP interceptors failed: {}", e))?;
let mut se = webrtc::api::setting_engine::SettingEngine::default();
#[cfg(test)]
if let Some(setting) = &transport.setting_engine { se = setting.clone(); }
se.set_answering_dtls_role(DTLSRole::Server)
.map_err(|e| format!("Configure DTLS answer role failed: {}", e))?;
se.set_ice_multicast_dns_mode(webrtc::ice::mdns::MulticastDnsMode::Disabled);
+8 -3
View File
@@ -13,15 +13,17 @@ struct Viewer {
pc: Arc<RTCPeerConnection>,
channels: HashMap<String, Arc<RTCDataChannel>>,
messages: Messages,
router: Arc<Mutex<webrtc::util::vnet::router::Router>>,
}
async fn connect(desktop: bool, portal: Option<Arc<crate::desktop_session::PortalDesktop>>)
-> (WebRtcSession, Viewer) {
let input = Arc::new(InputInjector::without_desktop());
let (host_setting, viewer_setting, router) = crate::test_network::virtual_network().await;
let screen = Arc::new(ScreenCapture::unavailable("synthetic pending desktop".into()));
let host = WebRtcSession::new(screen, input, crate::signaling::SignalingClient::disconnected(),
desktop, crate::session_ice::SessionIce::local(), portal).await.unwrap();
let pc = Arc::new(APIBuilder::new().build().new_peer_connection(RTCConfiguration::default()).await.unwrap());
desktop, crate::session_ice::SessionIce::virtual_net(host_setting), portal).await.unwrap();
let pc = Arc::new(APIBuilder::new().with_setting_engine(viewer_setting).build().new_peer_connection(RTCConfiguration::default()).await.unwrap());
let (tx, messages) = mpsc::unbounded_channel();
let mut channels = HashMap::new();
for label in ["CONTROL_DATA_CHANNEL"] {
@@ -46,7 +48,7 @@ async fn connect(desktop: bool, portal: Option<Arc<crate::desktop_session::Porta
tokio::time::sleep(Duration::from_millis(20)).await;
}
}).await.expect("local SCTP channels did not open");
(host, Viewer { pc, channels, messages })
(host, Viewer { pc, channels, messages, router })
}
fn body(message: &[u8], number: u32) -> Option<&[u8]> {
@@ -137,6 +139,7 @@ async fn ready_without_portal_session_does_not_advertise_clipboard() {
"Echo was re-sent without an established clipboard capability");
viewer.pc.close().await.unwrap();
host.pc.close().await.unwrap();
viewer.router.lock().await.stop().await.unwrap();
}).await.expect("clipboard capability regression exceeded deadline");
}
@@ -201,6 +204,7 @@ async fn pending_portal_answers_echo_immediately_and_defers_capture_settings() {
viewer.pc.close().await.unwrap();
host.pc.close().await.unwrap();
viewer.router.lock().await.stop().await.unwrap();
}).await.expect("pending-Portal lifecycle regression exceeded deadline");
}
@@ -220,5 +224,6 @@ async fn tool_peer_applies_capture_settings_without_a_desktop() {
assert_eq!((varint_of(sync, 5), varint_of(sync, 6)), (Some(1280), Some(720)));
viewer.pc.close().await.unwrap();
host.pc.close().await.unwrap();
viewer.router.lock().await.stop().await.unwrap();
}).await.expect("tool capture-setting regression exceeded deadline");
}