wip

examples/ssb-cli.rs

@@ -156,13 +156,17 @@ async fn main() -> AnyResult<()> {
         let msg =  String::from_utf8(buf[..amt].to_vec())?;
 
         println!("got broadcasted {}",msg);
-        let broadcast_regexp = r"net:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+):([0-9]+)~shs:([0-9a-zA-Z=]+)";
+        let broadcast_regexp = r"net:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+):([0-9]+)~shs:([0-9a-zA-Z=/]+)";
         let captures = Regex::new(broadcast_regexp).unwrap().captures(&msg).unwrap();
         (captures[1].to_string(),captures[2].to_string(),captures[3].to_string())
     };
 
     let server_pk = ed25519::PublicKey::from_slice(&base64::decode(&server_pk)?).expect("bad public key");
-    let mut socket = TcpStream::connect(format!("{}:{}", ip, port)).await?;
+    let server_ipport = format!("{}:{}", ip, port);
+
+    println!("server_ip_port={}",server_ipport);
+
+    let mut socket = TcpStream::connect(server_ipport).await?;
 
     let handshake = handshake_client(&mut socket, ssb_net_id(), pk, sk.clone(), server_pk).await?;
 

src/rpc/stream.rs

@@ -2,6 +2,7 @@ use super::error::{Error, Result};
 
 use async_std::io;
 use async_std::prelude::*;
+use log::trace;
 
 use kuska_handshake::async_std::{BoxStreamRead, BoxStreamWrite};
 
@@ -147,6 +148,8 @@ impl<R: io::Read + Unpin, W: io::Write + Unpin> RpcStream<R, W> {
         let mut body_raw: Vec<u8> = vec![0; rpc_header.body_len as usize];
         self.box_reader.read_exact(&mut body_raw[..]).await?;
 
+        trace!("got {}",String::from_utf8_lossy(&body_raw[..]));
+
         if rpc_header.req_no > 0 {
             let rpc_body = serde_json::from_slice(&body_raw)?;
             Ok((rpc_header.req_no, RecvMsg::Request(rpc_body)))