Merge pull request #29 from CoLearn-Dev/request-info

- add version to RequestInfo
- replace structopt with clap

Author: stneng

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "proto"]
 	path = proto
-	url = git@github.com:CoLearn-Dev/colink-proto-dev.git
+	url = https://github.com/CoLearn-Dev/colink-proto-dev.git
 	branch = main

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "colink"
-version = "0.2.1"
+version = "0.2.2"
 edition = "2021"
 description = "CoLink Rust SDK"
 license = "MIT"
@@ -13,6 +13,7 @@ repository = "https://github.com/CoLearn-Dev/colink-sdk-rust-dev"
 async-trait = "0.1"
 base64 = "0.13.0"
 chrono = "0.4"
+clap = { version = "4.0", features = ["derive", "env"] }
 futures-lite = "1.12"
 lapin = "2.1"
 prost = "0.10"
@@ -21,7 +22,6 @@ secp256k1 = { version = "0.21.2", features = ["rand-std"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 sha2 = "0.10"
-structopt = "0.3"
 tokio = { version = "1.18", features = ["macros", "rt-multi-thread", "rt", "fs"] }
 tonic = { version = "0.7", features = ["tls", "tls-roots"] }
 tracing = "0.1"

examples/host_import_user.rs

@@ -15,7 +15,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>
 
     let cl = CoLink::new(addr, jwt);
     let (pk, sk) = generate_user();
-    let (_, core_pub_key, _) = cl.request_info().await?;
+    let core_pub_key = cl.request_info().await?.core_public_key;
     let (signature_timestamp, sig) =
         prepare_import_user_signature(&pk, &sk, &core_pub_key, expiration_timestamp);
     println!(

examples/host_import_users.rs

@@ -19,7 +19,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>
     let mut users = vec![];
     for _ in 0..num {
         let (pk, sk) = generate_user();
-        let (_, core_pub_key, _) = cl.request_info().await?;
+        let core_pub_key = cl.request_info().await?.core_public_key;
         let (signature_timestamp, sig) =
             prepare_import_user_signature(&pk, &sk, &core_pub_key, expiration_timestamp);
         users.push(

examples/host_import_users_and_exchange_guest_jwts.rs

@@ -20,7 +20,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>
     let mut guest_jwts = vec![];
     for i in 0..num {
         let (pk, sk) = generate_user();
-        let (_, core_pub_key, _) = cl.request_info().await?;
+        let core_pub_key = cl.request_info().await?.core_public_key;
         let (signature_timestamp, sig) =
             prepare_import_user_signature(&pk, &sk, &core_pub_key, expiration_timestamp);
         users.push(

examples/host_import_users_and_set_registry.rs

@@ -19,7 +19,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>
     let cl = CoLink::new(addr, jwt);
     let mut users = vec![];
     let (pk, sk) = generate_user();
-    let (_, core_pub_key, _) = cl.request_info().await?;
+    let core_pub_key = cl.request_info().await?.core_public_key;
     let (signature_timestamp, sig) =
         prepare_import_user_signature(&pk, &sk, &core_pub_key, expiration_timestamp);
     let registry_user = cl
@@ -42,7 +42,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>
     clt.update_registries(&registries).await?;
     for i in 0..num {
         let (pk, sk) = generate_user();
-        let (_, core_pub_key, _) = cl.request_info().await?;
+        let core_pub_key = cl.request_info().await?.core_public_key;
         let (signature_timestamp, sig) =
             prepare_import_user_signature(&pk, &sk, &core_pub_key, expiration_timestamp);
         users.push(

examples/mtls_request_info.rs

@@ -12,7 +12,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>
     let cl = CoLink::new(addr, "")
         .ca_certificate(ca_certificate)
         .identity(client_cert, client_key);
-    let (_, core_pub_key, _) = cl.request_info().await?;
+    let core_pub_key = cl.request_info().await?.core_public_key;
     println!("{}", core_pub_key);
 
     Ok(())

proto

@@ -350,13 +350,14 @@ impl CoLink {
         Ok(())
     }
 
-    pub async fn request_info(&self) -> Result<(String, secp256k1::PublicKey, String), Error> {
+    pub async fn request_info(&self) -> Result<CoLinkInfo, Error> {
         let mut client = self._grpc_connect(&self.core_addr).await?;
         let request = generate_request(&self.jwt, Empty::default());
         let response = client.request_info(request).await?;
         debug!("RESPONSE={:?}", response);
         let mq_uri = response.get_ref().mq_uri.clone();
         let requestor_ip = response.get_ref().requestor_ip.clone();
+        let version = response.get_ref().version.clone();
         let core_public_key_vec: Vec<u8> = response.get_ref().core_public_key.clone();
         let core_public_key: secp256k1::PublicKey =
             match secp256k1::PublicKey::from_slice(&core_public_key_vec) {
@@ -368,7 +369,12 @@ impl CoLink {
                     ))))
                 }
             };
-        Ok((mq_uri, core_public_key, requestor_ip))
+        Ok(CoLinkInfo {
+            mq_uri,
+            core_public_key,
+            requestor_ip,
+            version,
+        })
     }
 
     pub async fn subscribe(
@@ -407,7 +413,7 @@ impl CoLink {
     }
 
     pub async fn new_subscriber(&self, queue_name: &str) -> Result<CoLinkSubscriber, Error> {
-        let (mq_uri, _, _) = self.request_info().await?;
+        let mq_uri = self.request_info().await?.mq_uri;
         let subscriber = CoLinkSubscriber::new(&mq_uri, queue_name).await?;
         Ok(subscriber)
     }
@@ -446,6 +452,13 @@ impl CoLink {
     }
 }
 
+pub struct CoLinkInfo {
+    pub mq_uri: String,
+    pub core_public_key: secp256k1::PublicKey,
+    pub requestor_ip: String,
+    pub version: String,
+}
+
 pub struct CoLinkSubscriber {
     consumer: Consumer,
 }

src/application.rs

@@ -7,7 +7,7 @@ impl crate::application::CoLink {
         let auth_content = decode_jwt_without_validation(&self.jwt)?;
         let expiration_timestamp = auth_content.exp;
         let (pk, sk) = crate::generate_user();
-        let (_, core_pub_key, _) = self.request_info().await?;
+        let core_pub_key = self.request_info().await?.core_public_key;
         let (signature_timestamp, sig) =
             crate::prepare_import_user_signature(&pk, &sk, &core_pub_key, expiration_timestamp);
         self.import_user(&pk, signature_timestamp, expiration_timestamp, &sig)

src/extensions/switch_to_generated_user.rs

@@ -1,5 +1,6 @@
 use crate::{application::*, utils::get_path_timestamp};
 pub use async_trait::async_trait;
+use clap::Parser;
 use futures_lite::stream::StreamExt;
 use lapin::{
     options::{BasicAckOptions, BasicConsumeOptions, BasicQosOptions},
@@ -12,7 +13,6 @@ use std::{
     sync::{Arc, Mutex},
     thread,
 };
-use structopt::StructOpt;
 use tracing::{debug, error};
 
 type Error = Box<dyn std::error::Error + Send + Sync + 'static>;
@@ -98,7 +98,7 @@ impl CoLinkProtocol {
         };
         self.cl.unlock(lock).await?;
 
-        let (mq_addr, _, _) = self.cl.request_info().await?;
+        let mq_addr = self.cl.request_info().await?.mq_uri;
         let mq = Connection::connect(&mq_addr, ConnectionProperties::default()).await?;
         let channel = mq.create_channel().await?;
         channel.basic_qos(1, BasicQosOptions::default()).await?;
@@ -241,27 +241,27 @@ pub fn _protocol_start(
     Ok(())
 }
 
-#[derive(Debug, StructOpt)]
-#[structopt(name = "CoLink-SDK", about = "CoLink-SDK")]
+#[derive(Debug, Parser)]
+#[command(name = "CoLink-SDK", about = "CoLink-SDK")]
 pub struct CommandLineArgs {
     /// Address of CoLink server
-    #[structopt(short, long, env = "COLINK_CORE_ADDR")]
+    #[arg(short, long, env = "COLINK_CORE_ADDR")]
     pub addr: String,
 
     /// User JWT
-    #[structopt(short, long, env = "COLINK_JWT")]
+    #[arg(short, long, env = "COLINK_JWT")]
     pub jwt: String,
 
     /// Path to CA certificate.
-    #[structopt(long, env = "COLINK_CA_CERT")]
+    #[arg(long, env = "COLINK_CA_CERT")]
     pub ca: Option<String>,
 
     /// Path to client certificate.
-    #[structopt(long, env = "COLINK_CLIENT_CERT")]
+    #[arg(long, env = "COLINK_CLIENT_CERT")]
     pub cert: Option<String>,
 
     /// Path to private key.
-    #[structopt(long, env = "COLINK_CLIENT_KEY")]
+    #[arg(long, env = "COLINK_CLIENT_KEY")]
     pub key: Option<String>,
 }
 
@@ -273,7 +273,7 @@ pub fn _colink_parse_args() -> CoLink {
         ca,
         cert,
         key,
-    } = CommandLineArgs::from_args();
+    } = CommandLineArgs::parse();
     let mut cl = CoLink::new(&addr, &jwt);
     if let Some(ca) = ca {
         cl = cl.ca_certificate(&ca);