feat(pubky): PubkyClient::builder().build() return result

examples/authn/signup.rs

@@ -24,7 +24,7 @@ async fn main() -> Result<()> {
 
     let homeserver = cli.homeserver;
 
-    let client = PubkyClient::builder().build();
+    let client = PubkyClient::new()?;
 
     println!("Enter your recovery_file's passphrase to signup:");
     let passphrase = rpassword::read_password()?;

examples/authz/authenticator.rs

@@ -66,7 +66,7 @@ async fn main() -> Result<()> {
     println!("PublicKey: {}", keypair.public_key());
 
     let client = if cli.testnet.unwrap_or_default() {
-        let client = PubkyClient::testnet();
+        let client = PubkyClient::testnet()?;
 
         // For the purposes of this demo, we need to make sure
         // the user has an account on the local homeserver.
@@ -78,7 +78,7 @@ async fn main() -> Result<()> {
 
         client
     } else {
-        PubkyClient::builder().build()
+        PubkyClient::new()?
     };
 
     println!("Sending AuthToken to the 3rd party app...");

examples/request/main.rs

@@ -18,14 +18,14 @@ struct Cli {
 async fn main() -> Result<()> {
     let cli = Cli::parse();
 
-    let client = PubkyClient::builder().build();
+    let client = PubkyClient::new()?;
 
     match cli.url.scheme() {
         "https" => {
             unimplemented!();
         }
         "pubky" => {
-            let response = client.get(cli.url).await.unwrap();
+            let response = client.get(cli.url).await?;
 
             println!("Got a response: \n {:?}", response);
         }

pubky/README.md

@@ -19,7 +19,7 @@ async fn main () {
   let client = PubkyClient::test(&testnet);
 
   // Uncomment the following line instead if you are not just testing.
-  // let client PubkyClient::builder().build(); 
+  // let client PubkyClient::new().unwrap(); 
 
   // Generate a keypair
   let keypair = Keypair::random();

pubky/src/native.rs

@@ -43,46 +43,48 @@ impl Settings {
     }
 
     /// Build [PubkyClient]
-    pub fn build(self) -> PubkyClient {
+    pub fn build(self) -> Result<PubkyClient, std::io::Error> {
         // TODO: convert to Result<PubkyClient>
 
-        let pkarr = pkarr::Client::new(self.pkarr_settings).unwrap();
+        let pkarr = pkarr::Client::new(self.pkarr_settings)?;
 
-        PubkyClient {
+        Ok(PubkyClient {
             http: reqwest::Client::builder()
                 .cookie_store(true)
                 // .dns_resolver(Arc::new(dns_resolver))
                 .user_agent(DEFAULT_USER_AGENT)
                 .build()
                 .unwrap(),
             pkarr,
-        }
+        })
     }
 }
 
-impl Default for PubkyClient {
-    fn default() -> Self {
-        PubkyClient::builder().build()
+impl PubkyClient {
+    /// Create a new [PubkyClient] with default [Settings]
+    pub fn new() -> Result<Self, std::io::Error> {
+        Self::builder().build()
     }
-}
 
-impl PubkyClient {
     /// Returns a builder to edit settings before creating [PubkyClient].
     pub fn builder() -> Settings {
         Settings::default()
     }
 
     /// Create a client connected to the local network
     /// with the bootstrapping node: `localhost:6881`
-    pub fn testnet() -> Self {
-        Self::test(&Testnet {
-            bootstrap: vec!["localhost:6881".to_string()],
-            nodes: vec![],
-        })
+    pub fn testnet() -> Result<Self, std::io::Error> {
+        Self::builder()
+            .testnet(&Testnet {
+                bootstrap: vec!["localhost:6881".to_string()],
+                nodes: vec![],
+            })
+            .build()
     }
 
-    /// Alias to `PubkyClient::builder().testnet(testnet).build()`
-    pub fn test(testnet: &Testnet) -> PubkyClient {
-        PubkyClient::builder().testnet(testnet).build()
+    #[cfg(test)]
+    /// Alias to `PubkyClient::builder().testnet(testnet).build().unwrap()`
+    pub(crate) fn test(testnet: &Testnet) -> PubkyClient {
+        PubkyClient::builder().testnet(testnet).build().unwrap()
     }
 }

pubky/src/native/api/http.rs

@@ -33,7 +33,7 @@ mod tests {
 
         let homeserver = Homeserver::start_test(&testnet).await.unwrap();
 
-        let client = PubkyClient::builder().testnet(&testnet).build();
+        let client = PubkyClient::test(&testnet);
 
         let url = format!("http://{}/", homeserver.public_key());
 
@@ -50,7 +50,7 @@ mod tests {
     async fn http_get_icann() {
         let testnet = Testnet::new(10).unwrap();
 
-        let client = PubkyClient::builder().testnet(&testnet).build();
+        let client = PubkyClient::test(&testnet);
 
         let url = format!("http://example.com/");