add new_from_uri() method to Client

version 1.0.1

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.0.1
+- only bitcoinsv-rpc - added new() method for Client which accepts a URI with username and password included
+
 # 1.0.0
 - cargo update
 - add timeout parameter for Client

client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bitcoinsv-rpc"
-version = "1.0.0"
+version = "1.0.1"
 authors = [
     "Daniel Connolly <[email protected]>"
 ]
@@ -26,6 +26,7 @@ serde_json = "1"
 hex = "0.4.3"
 bitcoinsv = "0.2.5"
 async-trait = "0.1.75"
+url = "2.5.0"
 
 [dev-dependencies]
 tempfile = "3.3.0"

client/src/client.rs

@@ -4,6 +4,7 @@ use std::io::{BufRead, BufReader, Cursor};
 use std::iter::FromIterator;
 use std::path::PathBuf;
 use std::{fmt, result};
+use url::Url;
 use async_trait::async_trait;
 use hex::{FromHex, ToHex};
 use jsonrpc;
@@ -538,6 +539,24 @@ impl Client {
         };
         Ok(Client {client: jsonrpc::client::Client::with_transport(b.build())})
     }
+
+    pub fn new_from_uri(uri: &str, timeout: Option<std::time::Duration>) -> Result<Self>  {
+        let url;
+        let username;
+        let password;
+        match Url::parse(&*uri) {
+            Err(_e) => {
+                println!("could not parse RPC URI");
+                return Err(Error::InvalidUri);
+            }
+            Ok(result) => {
+                url = format!("{}://{}:{}/", result.scheme(), result.host_str().unwrap(), result.port().unwrap());
+                username = String::from(result.username());
+                password = String::from(result.password().unwrap());
+            }
+        }
+        Client::new(&url, Auth::UserPass(username, password), timeout)
+    }
 }
 
 impl RpcApi for Client {

client/src/error.rs

@@ -15,6 +15,8 @@ pub enum Error {
     UnexpectedStructure,
     /// The daemon returned an error string.
     ReturnedError(String),
+    /// The URI could not be parsed.
+    InvalidUri,
     MinReqError(jsonrpc::minreq_http::Error),
     SVJsonError(bitcoinsv::Error),
 }
@@ -43,12 +45,6 @@ impl From<io::Error> for Error {
     }
 }
 
-// impl From<bitcoinsv::Error> for Error {
-//     fn from(e: bitcoinsv::Error) -> Error {
-//         Error::BitcoinSVError(e)
-//     }
-// }
-//
 impl From<jsonrpc::minreq_http::Error> for Error {
     fn from(e: jsonrpc::minreq_http::Error) -> Error {
         Error::MinReqError(e)
@@ -71,7 +67,7 @@ impl fmt::Display for Error {
             Error::InvalidCookieFile => write!(f, "invalid cookie file"),
             Error::UnexpectedStructure => write!(f, "the JSON result had an unexpected structure"),
             Error::ReturnedError(ref s) => write!(f, "the daemon returned an error string: {}", s),
-            // Error::BitcoinSVError(ref e) => write!(f, "BSV error: {}", e),
+            Error::InvalidUri => write!(f, "the URI could not be parsed"),
             Error::MinReqError(ref e) => write!(f, "HTTPMinReq: {}", e),
             Error::SVJsonError(ref e) => write!(f, "SVJson: {}", e),
         }