44use std:: time:: SystemTime ;
55
66use buzz_core:: kind:: KIND_READ_STATE ;
7- use nostr:: nips:: nip44;
87use nostr:: { EventBuilder , Kind , Tag , Timestamp } ;
98use serde_json:: { json, Value } ;
109
@@ -58,7 +57,7 @@ pub(crate) async fn fetch_head<T>(
5857 lane : Lane ,
5958 decode : impl FnOnce ( & Value , u64 ) -> Option < T > ,
6059) -> Result < Head < T > , CliError > {
61- let me = client. keys ( ) . public_key ( ) ;
60+ let me = client. public_key ( ) ;
6261 let filter = json ! ( {
6362 "kinds" : [ KIND_READ_STATE ] ,
6463 "authors" : [ me. to_hex( ) ] ,
@@ -103,8 +102,11 @@ pub(crate) async fn fetch_head<T>(
103102 event. id. to_hex( )
104103 ) )
105104 } ;
106- let plaintext = nip44:: decrypt ( client. keys ( ) . secret_key ( ) , & me, & event. content )
107- . map_err ( |e| unreadable ( e. to_string ( ) ) ) ?;
105+ let plaintext = client
106+ . credentials ( )
107+ . nip44_decrypt ( & me, & event. content )
108+ . await ?
109+ . ok_or_else ( || unreadable ( "not valid ciphertext for this key" . into ( ) ) ) ?;
108110 let json: Value = serde_json:: from_str ( & plaintext) . map_err ( |e| unreadable ( e. to_string ( ) ) ) ?;
109111 let created_at = event. created_at . as_secs ( ) ;
110112 let doc = decode ( & json, created_at) . ok_or_else ( || {
@@ -125,7 +127,7 @@ pub(crate) async fn publish(
125127 plaintext : String ,
126128 head_created_at : u64 ,
127129) -> Result < Value , CliError > {
128- let keys = client. keys ( ) ;
130+ let me = client. public_key ( ) ;
129131 let too_large = || {
130132 CliError :: Usage ( format ! (
131133 "{} would exceed the relay's event size limit" ,
@@ -136,21 +138,21 @@ pub(crate) async fn publish(
136138 if plaintext. len ( ) > u16:: MAX as usize {
137139 return Err ( too_large ( ) ) ;
138140 }
139- let content = nip44:: encrypt (
140- keys. secret_key ( ) ,
141- & keys. public_key ( ) ,
142- plaintext,
143- nip44:: Version :: V2 ,
144- )
145- . map_err ( |e| CliError :: Other ( format ! ( "failed to encrypt {}: {e}" , lane. label) ) ) ?;
141+ let content = client
142+ . credentials ( )
143+ . nip44_encrypt ( & me, & plaintext)
144+ . await
145+ . map_err ( |e| CliError :: Other ( format ! ( "failed to encrypt {}: {e}" , lane. label) ) ) ?;
146146 if content. len ( ) > MAX_CIPHERTEXT_BYTES {
147147 return Err ( too_large ( ) ) ;
148148 }
149149 let created_at = now ( ) . as_secs ( ) . max ( head_created_at + 1 ) ;
150150 let builder = EventBuilder :: new ( Kind :: Custom ( KIND_READ_STATE as u16 ) , content)
151151 . tags ( [ Tag :: identifier ( lane. d_tag ) , Tag :: hashtag ( lane. d_tag ) ] )
152152 . custom_created_at ( Timestamp :: from ( created_at) ) ;
153- let raw = client. submit_event ( client. sign_event ( builder) ?) . await ?;
153+ let raw = client
154+ . submit_event ( client. sign_event ( builder) . await ?)
155+ . await ?;
154156 let normalized = parse_write_response (
155157 & raw,
156158 & format ! ( "a newer {} update won; run the command again" , lane. label) ,
@@ -210,7 +212,9 @@ pub(crate) fn unchanged() -> Value {
210212#[ cfg( test) ]
211213pub ( crate ) mod test_support {
212214 use super :: * ;
215+ use crate :: credentials:: Credentials ;
213216 use axum:: { body:: Bytes , extract:: State , routing:: post, Json , Router } ;
217+ use nostr:: nips:: nip44;
214218 use nostr:: Keys ;
215219 use std:: sync:: { Arc , Mutex } ;
216220 use tokio:: net:: TcpListener ;
@@ -279,7 +283,7 @@ pub(crate) mod test_support {
279283 pub async fn setup ( ) -> ( BuzzClient , Shared ) {
280284 let relay = Shared :: default ( ) ;
281285 let url = fake_relay ( relay. clone ( ) ) . await ;
282- let client = BuzzClient :: new ( url, Keys :: generate ( ) , None , None ) . unwrap ( ) ;
286+ let client = BuzzClient :: new ( url, Credentials :: from_keys ( Keys :: generate ( ) ) ) . unwrap ( ) ;
283287 ( client, relay)
284288 }
285289
@@ -290,7 +294,7 @@ pub(crate) mod test_support {
290294 plaintext : & str ,
291295 created_at : u64 ,
292296 ) -> Value {
293- let keys = client. keys ( ) ;
297+ let keys = client. credentials ( ) . test_keys ( ) ;
294298 let content = nip44:: encrypt (
295299 keys. secret_key ( ) ,
296300 & keys. public_key ( ) ,
@@ -301,7 +305,7 @@ pub(crate) mod test_support {
301305 let event = EventBuilder :: new ( Kind :: Custom ( KIND_READ_STATE as u16 ) , content)
302306 . tags ( [ Tag :: identifier ( lane. d_tag ) ] )
303307 . custom_created_at ( Timestamp :: from ( created_at) )
304- . sign_with_keys ( keys)
308+ . sign_with_keys ( & keys)
305309 . unwrap ( ) ;
306310 let event = serde_json:: to_value ( event) . unwrap ( ) ;
307311 relay. lock ( ) . unwrap ( ) . events . push ( event. clone ( ) ) ;
@@ -312,7 +316,7 @@ pub(crate) mod test_support {
312316 pub fn published ( client : & BuzzClient , relay : & Shared ) -> ( nostr:: Event , Value ) {
313317 let raw = relay. lock ( ) . unwrap ( ) . events . last ( ) . cloned ( ) . unwrap ( ) ;
314318 let event: nostr:: Event = serde_json:: from_value ( raw) . unwrap ( ) ;
315- let keys = client. keys ( ) ;
319+ let keys = client. credentials ( ) . test_keys ( ) ;
316320 let plaintext =
317321 nip44:: decrypt ( keys. secret_key ( ) , & keys. public_key ( ) , & event. content ) . unwrap ( ) ;
318322 ( event, serde_json:: from_str ( & plaintext) . unwrap ( ) )
0 commit comments