@@ -9,7 +9,8 @@ use anyhow::{bail, Context, Result};
99use buzz_core:: {
1010 huddle_screen:: { ScreenMessage , ScreenShare } ,
1111 kind:: {
12- KIND_HUDDLE_SCREEN , KIND_NIP29_CREATE_GROUP , KIND_NIP29_EDIT_METADATA , KIND_NIP29_PUT_USER ,
12+ KIND_HUDDLE_CAMERA , KIND_HUDDLE_SCREEN , KIND_NIP29_CREATE_GROUP , KIND_NIP29_EDIT_METADATA ,
13+ KIND_NIP29_PUT_USER ,
1314 } ,
1415} ;
1516use buzz_test_client:: { BuzzTestClient , RelayMessage } ;
@@ -32,8 +33,12 @@ struct Room {
3233}
3334
3435fn filter ( channel : & str ) -> Filter {
36+ video_filter ( channel, KIND_HUDDLE_SCREEN )
37+ }
38+
39+ fn video_filter ( channel : & str , kind : u32 ) -> Filter {
3540 Filter :: new ( )
36- . kind ( Kind :: Custom ( KIND_HUDDLE_SCREEN as u16 ) )
41+ . kind ( Kind :: Custom ( kind as u16 ) )
3742 . custom_tags ( SingleLetterTag :: lowercase ( Alphabet :: H ) , [ channel] )
3843 . limit ( 0 )
3944}
@@ -64,9 +69,18 @@ fn video_packets() -> Result<Vec<ScreenMessage>> {
6469}
6570
6671fn screen_event ( keys : & Keys , message : & ScreenMessage , channels : & [ & str ] ) -> Result < Event > {
72+ video_event ( keys, message, channels, KIND_HUDDLE_SCREEN )
73+ }
74+
75+ fn video_event (
76+ keys : & Keys ,
77+ message : & ScreenMessage ,
78+ channels : & [ & str ] ,
79+ kind : u32 ,
80+ ) -> Result < Event > {
6781 sign (
6882 keys,
69- KIND_HUDDLE_SCREEN ,
83+ kind ,
7084 serde_json:: to_string ( message) ?,
7185 channels
7286 . iter ( )
@@ -75,6 +89,106 @@ fn screen_event(keys: &Keys, message: &ScreenMessage, channels: &[&str]) -> Resu
7589 )
7690}
7791
92+ #[ tokio:: test]
93+ #[ ignore = "Requires Postgres, Redis, and a local relay built from this branch" ]
94+ async fn camera_and_screen_share_independent_private_live_tracks_without_persistence ( ) -> Result < ( ) >
95+ {
96+ let mut room = room ( ) . await ?;
97+ let mut viewer = BuzzTestClient :: connect ( & room. url , & room. viewer ) . await ?;
98+ viewer
99+ . subscribe (
100+ "cameras" ,
101+ vec ! [ video_filter( & room. channel, KIND_HUDDLE_CAMERA ) ] ,
102+ )
103+ . await ?;
104+ assert ! ( viewer
105+ . collect_until_eose( "cameras" , DEADLINE )
106+ . await ?
107+ . is_empty( ) ) ;
108+ viewer
109+ . subscribe ( "screens" , vec ! [ filter( & room. channel) ] )
110+ . await ?;
111+ assert ! ( viewer
112+ . collect_until_eose( "screens" , DEADLINE )
113+ . await ?
114+ . is_empty( ) ) ;
115+ let packets = video_packets ( ) ?;
116+ let camera = video_event (
117+ & room. owner ,
118+ & packets[ 0 ] ,
119+ & [ & room. channel ] ,
120+ KIND_HUDDLE_CAMERA ,
121+ ) ?;
122+ let screen = screen_event ( & room. owner , & packets[ 0 ] , & [ & room. channel ] ) ?;
123+ for ( event, subscription) in [ ( camera, "cameras" ) , ( screen, "screens" ) ] {
124+ let id = event. id ;
125+ accepted ( & mut room. publisher , event) . await ?;
126+ assert ! ( matches!( viewer. recv_event( DEADLINE ) . await ?,
127+ RelayMessage :: Event { subscription_id, event }
128+ if subscription_id == subscription && event. id == id) ) ;
129+ }
130+ let ScreenMessage :: Video { share, .. } = & packets[ 0 ] else {
131+ bail ! ( "video fixture" )
132+ } ;
133+ accepted (
134+ & mut room. publisher ,
135+ video_event (
136+ & room. owner ,
137+ & ScreenMessage :: Stopped {
138+ share : share. clone ( ) ,
139+ } ,
140+ & [ & room. channel ] ,
141+ KIND_HUDDLE_CAMERA ,
142+ ) ?,
143+ )
144+ . await ?;
145+ assert ! ( matches!( viewer. recv_event( DEADLINE ) . await ?,
146+ RelayMessage :: Event { subscription_id, .. } if subscription_id == "cameras" ) ) ;
147+ accepted (
148+ & mut room. publisher ,
149+ screen_event ( & room. owner , & packets[ 1 ] , & [ & room. channel ] ) ?,
150+ )
151+ . await ?;
152+ assert ! ( matches!( viewer. recv_event( DEADLINE ) . await ?,
153+ RelayMessage :: Event { subscription_id, .. } if subscription_id == "screens" ) ) ;
154+ let mut outsider = BuzzTestClient :: connect ( & room. url , & room. outsider ) . await ?;
155+ assert ! (
156+ !outsider
157+ . send_event( video_event(
158+ & room. outsider,
159+ & packets[ 0 ] ,
160+ & [ & room. channel] ,
161+ KIND_HUDDLE_CAMERA
162+ ) ?)
163+ . await ?
164+ . accepted
165+ ) ;
166+ let mut other_tenant = BuzzTestClient :: connect ( & room. other_url , & room. owner ) . await ?;
167+ assert ! (
168+ !other_tenant
169+ . send_event( video_event(
170+ & room. owner,
171+ & packets[ 0 ] ,
172+ & [ & room. channel] ,
173+ KIND_HUDDLE_CAMERA
174+ ) ?)
175+ . await ?
176+ . accepted
177+ ) ;
178+ let stored: i64 = sqlx:: query_scalar (
179+ "SELECT count(*) FROM events WHERE community_id = $1 AND channel_id = $2 AND kind = ANY($3)" ,
180+ ) . bind ( room. community ) . bind ( Uuid :: parse_str ( & room. channel ) ?)
181+ . bind ( vec ! [ KIND_HUDDLE_CAMERA as i32 , KIND_HUDDLE_SCREEN as i32 ] )
182+ . fetch_one ( & room. pool ) . await ?;
183+ assert_eq ! ( stored, 0 , "neither video track may persist pixels" ) ;
184+ outsider. disconnect ( ) . await ?;
185+ other_tenant. disconnect ( ) . await ?;
186+ viewer. disconnect ( ) . await ?;
187+ room. publisher . disconnect ( ) . await ?;
188+ room. pool . close ( ) . await ;
189+ Ok ( ( ) )
190+ }
191+
78192async fn accepted ( client : & mut BuzzTestClient , event : Event ) -> Result < ( ) > {
79193 let response = client. send_event ( event) . await ?;
80194 assert ! (
0 commit comments