@@ -4917,6 +4917,44 @@ mod tests {
49174917 use nostr:: { EventBuilder , Keys , Kind , Tag , Timestamp } ;
49184918 use serde_json:: json;
49194919
4920+ fn request_queries_kind ( request : & [ u8 ] , kind : u32 ) -> bool {
4921+ let request = String :: from_utf8_lossy ( request) ;
4922+ let Some ( ( _, body) ) = request. split_once ( "\r \n \r \n " ) else {
4923+ return false ;
4924+ } ;
4925+ let Ok ( filters) = serde_json:: from_str :: < serde_json:: Value > ( body) else {
4926+ return false ;
4927+ } ;
4928+ filters. as_array ( ) . is_some_and ( |filters| {
4929+ filters. iter ( ) . any ( |filter| {
4930+ filter
4931+ . get ( "kinds" )
4932+ . and_then ( serde_json:: Value :: as_array)
4933+ . is_some_and ( |kinds| {
4934+ kinds
4935+ . iter ( )
4936+ . any ( |candidate| candidate. as_u64 ( ) == Some ( kind as u64 ) )
4937+ } )
4938+ } )
4939+ } )
4940+ }
4941+
4942+ fn signed_event_value (
4943+ keys : & Keys ,
4944+ kind : u32 ,
4945+ tags : Vec < Tag > ,
4946+ created_at : u64 ,
4947+ ) -> serde_json:: Value {
4948+ serde_json:: to_value (
4949+ EventBuilder :: new ( Kind :: Custom ( kind as u16 ) , "" )
4950+ . tags ( tags)
4951+ . custom_created_at ( Timestamp :: from ( created_at) )
4952+ . sign_with_keys ( keys)
4953+ . expect ( "sign test query event" ) ,
4954+ )
4955+ . expect ( "serialize test query event" )
4956+ }
4957+
49204958 fn test_mcp_server ( ) -> McpServer {
49214959 McpServer {
49224960 name : "dev" . into ( ) ,
@@ -6450,11 +6488,14 @@ done"#
64506488
64516489 let channel_id = Uuid :: new_v4 ( ) ;
64526490 let keys = Keys :: generate ( ) ;
6491+ let h_tag = Tag :: parse ( [ "h" , & channel_id. to_string ( ) ] ) . expect ( "h tag" ) ;
64536492 let carry_over = EventBuilder :: new ( Kind :: Custom ( 9 ) , "merged carry-over sentinel" )
6493+ . tags ( [ h_tag. clone ( ) ] )
64546494 . sign_with_keys ( & keys)
64556495 . unwrap ( ) ;
64566496 let carry_over_id = carry_over. id . to_hex ( ) ;
64576497 let new_event = EventBuilder :: new ( Kind :: Custom ( 9 ) , "merged new-event sentinel" )
6498+ . tags ( [ h_tag] )
64586499 . sign_with_keys ( & keys)
64596500 . unwrap ( ) ;
64606501 let new_event_id = new_event. id . to_hex ( ) ;
@@ -6496,10 +6537,17 @@ done"#
64966537 let server = tokio:: spawn ( async move {
64976538 while let Ok ( ( mut socket, _) ) = listener. accept ( ) . await {
64986539 let mut request = vec ! [ 0 ; 16 * 1024 ] ;
6499- let _ = socket. read ( & mut request) . await ;
6540+ let read = socket. read ( & mut request) . await . unwrap_or ( 0 ) ;
6541+ let body =
6542+ if request_queries_kind ( & request[ ..read] , buzz_core:: kind:: KIND_STREAM_MESSAGE )
6543+ {
6544+ response_body. as_str ( )
6545+ } else {
6546+ "[]"
6547+ } ;
65006548 let response = format ! (
65016549 "HTTP/1.1 200 OK\r \n Content-Type: application/json\r \n Content-Length: {}\r \n Connection: close\r \n \r \n {}" ,
6502- response_body . len( ) , response_body
6550+ body . len( ) , body
65036551 ) ;
65046552 let _ = socket. write_all ( response. as_bytes ( ) ) . await ;
65056553 }
@@ -6624,6 +6672,7 @@ done"#
66246672 let channel_id = Uuid :: new_v4 ( ) ;
66256673 let keys = Keys :: generate ( ) ;
66266674 let steered_event = EventBuilder :: new ( Kind :: Custom ( 9 ) , "steered context must not replay" )
6675+ . tags ( [ Tag :: parse ( [ "h" , & channel_id. to_string ( ) ] ) . expect ( "h tag" ) ] )
66276676 . sign_with_keys ( & keys)
66286677 . unwrap ( ) ;
66296678 let steered_event_id = steered_event. id . to_hex ( ) ;
@@ -6652,10 +6701,17 @@ done"#
66526701 let server = tokio:: spawn ( async move {
66536702 while let Ok ( ( mut socket, _) ) = listener. accept ( ) . await {
66546703 let mut request = vec ! [ 0 ; 16 * 1024 ] ;
6655- let _ = socket. read ( & mut request) . await ;
6704+ let read = socket. read ( & mut request) . await . unwrap_or ( 0 ) ;
6705+ let body =
6706+ if request_queries_kind ( & request[ ..read] , buzz_core:: kind:: KIND_STREAM_MESSAGE )
6707+ {
6708+ response_body. as_str ( )
6709+ } else {
6710+ "[]"
6711+ } ;
66566712 let response = format ! (
66576713 "HTTP/1.1 200 OK\r \n Content-Type: application/json\r \n Content-Length: {}\r \n Connection: close\r \n \r \n {}" ,
6658- response_body . len( ) , response_body
6714+ body . len( ) , body
66596715 ) ;
66606716 let _ = socket. write_all ( response. as_bytes ( ) ) . await ;
66616717 }
@@ -8629,12 +8685,20 @@ printf '%s\n' '{{"jsonrpc":"2.0","id":0,"result":{{"stopReason":"end_turn"}}}}'"
86298685 let base_url = format ! ( "http://{}" , listener. local_addr( ) . unwrap( ) ) ;
86308686 let requests = std:: sync:: Arc :: new ( AtomicUsize :: new ( 0 ) ) ;
86318687 let server_requests = requests. clone ( ) ;
8632- let body = response. to_string ( ) ;
8688+ let metadata_body = response. to_string ( ) ;
86338689 let server = tokio:: spawn ( async move {
86348690 while let Ok ( ( mut socket, _) ) = listener. accept ( ) . await {
86358691 let mut buf = vec ! [ 0 ; 8192 ] ;
8636- let _ = socket. read ( & mut buf) . await ;
8692+ let read = socket. read ( & mut buf) . await . unwrap_or ( 0 ) ;
86378693 server_requests. fetch_add ( 1 , Ordering :: SeqCst ) ;
8694+ let body = if request_queries_kind (
8695+ & buf[ ..read] ,
8696+ buzz_core:: kind:: KIND_NIP29_GROUP_METADATA ,
8697+ ) {
8698+ metadata_body. as_str ( )
8699+ } else {
8700+ "[]"
8701+ } ;
86388702 let response = format ! (
86398703 "HTTP/1.1 200 OK\r \n Content-Type: application/json\r \n Content-Length: {}\r \n Connection: close\r \n \r \n {}" ,
86408704 body. len( ) ,
@@ -8657,9 +8721,18 @@ printf '%s\n' '{{"jsonrpc":"2.0","id":0,"result":{{"stopReason":"end_turn"}}}}'"
86578721 }
86588722
86598723 fn channel_metadata_response ( id : Uuid , tags : & [ [ & str ; 2 ] ] ) -> serde_json:: Value {
8660- let mut event_tags = vec ! [ json!( [ "d" , id. to_string( ) ] ) ] ;
8661- event_tags. extend ( tags. iter ( ) . map ( |[ k, v] | json ! ( [ k, v] ) ) ) ;
8662- json ! ( [ { "tags" : event_tags } ] )
8724+ let id = id. to_string ( ) ;
8725+ let mut event_tags = vec ! [ Tag :: parse( [ "d" , id. as_str( ) ] ) . expect( "d tag" ) ] ;
8726+ event_tags. extend (
8727+ tags. iter ( )
8728+ . map ( |[ key, value] | Tag :: parse ( [ * key, * value] ) . expect ( "metadata tag" ) ) ,
8729+ ) ;
8730+ json ! ( [ signed_event_value(
8731+ & Keys :: generate( ) ,
8732+ buzz_core:: kind:: KIND_NIP29_GROUP_METADATA ,
8733+ event_tags,
8734+ 2_000 ,
8735+ ) ] )
86638736 }
86648737
86658738 #[ tokio:: test]
@@ -8668,19 +8741,29 @@ printf '%s\n' '{{"jsonrpc":"2.0","id":0,"result":{{"stopReason":"end_turn"}}}}'"
86688741
86698742 let id = Uuid :: new_v4 ( ) ;
86708743 let channel = id. to_string ( ) ;
8671- let owner = "a" . repeat ( 64 ) ;
8744+ let owner_keys = Keys :: generate ( ) ;
8745+ let owner = owner_keys. public_key ( ) . to_hex ( ) ;
86728746 let coordinate = format ! ( "30617:{owner}:app" ) ;
86738747 let responses = [
8674- json ! ( [ {
8675- "kind" : 30621 ,
8676- "pubkey" : owner,
8677- "tags" : [ [ "d" , "app" ] , [ "buzz-channel" , channel] , [ "a" , coordinate] ]
8678- } ] ) ,
8679- json ! ( [ {
8680- "kind" : 30617 ,
8681- "pubkey" : "a" . repeat( 64 ) ,
8682- "tags" : [ [ "d" , "app" ] , [ "buzz-channel" , id. to_string( ) ] ]
8683- } ] ) ,
8748+ json ! ( [ signed_event_value(
8749+ & owner_keys,
8750+ buzz_core:: kind:: KIND_PROJECT ,
8751+ vec![
8752+ Tag :: parse( [ "d" , "app" ] ) . expect( "project d tag" ) ,
8753+ Tag :: parse( [ "buzz-channel" , channel. as_str( ) ] ) . expect( "project channel tag" ) ,
8754+ Tag :: parse( [ "a" , coordinate. as_str( ) ] ) . expect( "project repo tag" ) ,
8755+ ] ,
8756+ 2_000 ,
8757+ ) ] ) ,
8758+ json ! ( [ signed_event_value(
8759+ & owner_keys,
8760+ buzz_core:: kind:: KIND_GIT_REPO_ANNOUNCEMENT ,
8761+ vec![
8762+ Tag :: parse( [ "d" , "app" ] ) . expect( "repo d tag" ) ,
8763+ Tag :: parse( [ "buzz-channel" , channel. as_str( ) ] ) . expect( "repo channel tag" ) ,
8764+ ] ,
8765+ 1_999 ,
8766+ ) ] ) ,
86848767 ] ;
86858768 let listener = tokio:: net:: TcpListener :: bind ( "127.0.0.1:0" ) . await . unwrap ( ) ;
86868769 let base_url = format ! ( "http://{}" , listener. local_addr( ) . unwrap( ) ) ;
@@ -8947,30 +9030,46 @@ done"#
89479030
89489031 let id = Uuid :: new_v4 ( ) ;
89499032 let channel = id. to_string ( ) ;
8950- let owner = "a" . repeat ( 64 ) ;
9033+ let owner_keys = Keys :: generate ( ) ;
9034+ let owner = owner_keys. public_key ( ) . to_hex ( ) ;
89519035 let coordinate = format ! ( "30617:{owner}:app" ) ;
9036+ let decoy_keys = Keys :: generate ( ) ;
89529037 let first_page: Vec < _ > = ( 0 ..500 )
89539038 . map ( |index| {
8954- json ! ( {
8955- "id" : format!( "{index:064x}" ) ,
8956- "created_at" : 1_000 - index,
8957- "kind" : 30621 ,
8958- "pubkey" : "b" . repeat( 64 ) ,
8959- "tags" : [ [ "d" , format!( "decoy-{index}" ) ] , [ "buzz-channel" , channel] ]
8960- } )
9039+ let identifier = format ! ( "decoy-{index}" ) ;
9040+ signed_event_value (
9041+ & decoy_keys,
9042+ buzz_core:: kind:: KIND_PROJECT ,
9043+ vec ! [
9044+ Tag :: parse( [ "d" , identifier. as_str( ) ] ) . expect( "decoy d tag" ) ,
9045+ Tag :: parse( [ "buzz-channel" , channel. as_str( ) ] ) . expect( "decoy channel tag" ) ,
9046+ ] ,
9047+ 1_000 - index,
9048+ )
89619049 } )
89629050 . collect ( ) ;
89639051 let responses = [
89649052 channel_metadata_response ( id, & [ [ "name" , "project-home" ] , [ "t" , "stream" ] ] ) ,
89659053 serde_json:: Value :: Array ( first_page) ,
8966- json ! ( [ {
8967- "id" : "f" . repeat( 64 ) , "created_at" : 1 , "kind" : 30621 , "pubkey" : owner,
8968- "tags" : [ [ "d" , "app" ] , [ "buzz-channel" , channel] , [ "a" , coordinate] ]
8969- } ] ) ,
8970- json ! ( [ {
8971- "id" : "e" . repeat( 64 ) , "created_at" : 1 , "kind" : 30617 , "pubkey" : "a" . repeat( 64 ) ,
8972- "tags" : [ [ "d" , "app" ] , [ "buzz-channel" , id. to_string( ) ] ]
8973- } ] ) ,
9054+ json ! ( [ signed_event_value(
9055+ & owner_keys,
9056+ buzz_core:: kind:: KIND_PROJECT ,
9057+ vec![
9058+ Tag :: parse( [ "d" , "app" ] ) . expect( "project d tag" ) ,
9059+ Tag :: parse( [ "buzz-channel" , channel. as_str( ) ] ) . expect( "project channel tag" ) ,
9060+ Tag :: parse( [ "a" , coordinate. as_str( ) ] ) . expect( "project repo tag" ) ,
9061+ ] ,
9062+ 1 ,
9063+ ) ] ) ,
9064+ json ! ( [ signed_event_value(
9065+ & owner_keys,
9066+ buzz_core:: kind:: KIND_GIT_REPO_ANNOUNCEMENT ,
9067+ vec![
9068+ Tag :: parse( [ "d" , "app" ] ) . expect( "repo d tag" ) ,
9069+ Tag :: parse( [ "buzz-channel" , channel. as_str( ) ] ) . expect( "repo channel tag" ) ,
9070+ ] ,
9071+ 1 ,
9072+ ) ] ) ,
89749073 ] ;
89759074 let listener = tokio:: net:: TcpListener :: bind ( "127.0.0.1:0" ) . await . unwrap ( ) ;
89769075 let base_url = format ! ( "http://{}" , listener. local_addr( ) . unwrap( ) ) ;
0 commit comments