blossom: refactor BlossomClient and examples to use Url for server

Updated `BlossomClient` and related examples to replace `String` with `Url` for server URLs.

Signed-off-by: Yuki Kishimoto <[email protected]>

Author: yukibtc

crates/nostr-blossom/examples/delete.rs

@@ -8,7 +8,7 @@ use nostr_blossom::prelude::*;
 struct Args {
     /// The server URL to connect to
     #[arg(long)]
-    server: String,
+    server: Url,
 
     /// The SHA256 hash of the blob to delete (in hex)
     #[arg(long)]
@@ -23,7 +23,7 @@ struct Args {
 async fn main() -> Result<()> {
     let args = Args::parse();
 
-    let client = BlossomClient::new(&args.server);
+    let client = BlossomClient::new(args.server);
 
     // Create signer keys using the given private key
     let keys = Keys::new(args.private_key);

crates/nostr-blossom/examples/download.rs

@@ -10,7 +10,7 @@ use nostr_blossom::prelude::*;
 struct Args {
     /// The server URL to connect to
     #[arg(long)]
-    server: String,
+    server: Url,
 
     /// SHA256 hash of the blob to download
     #[arg(long)]
@@ -26,7 +26,7 @@ async fn main() -> Result<()> {
     let args = Args::parse();
 
     // Initialize the client.
-    let client = BlossomClient::new(&args.server);
+    let client = BlossomClient::new(args.server);
 
     // Parse the private key.
     let keypair = Keys::new(args.private_key);

crates/nostr-blossom/examples/integration_test.rs

@@ -4,17 +4,16 @@ use std::path::PathBuf;
 
 use clap::Parser;
 use nostr::hashes::{sha256, Hash};
-use nostr::key::SecretKey;
-use nostr::Keys;
-use nostr_blossom::client::BlossomClient;
+use nostr::prelude::*;
+use nostr_blossom::prelude::*;
 
 /// Integration test for various Blossom operations: upload, check (HEAD), list, download, and delete.
 #[derive(Parser, Debug)]
 #[command(author, version, about = "Run several operations against a Blossom server for demonstration and testing", long_about = None)]
 struct Args {
     /// The Blossom server URL
     #[arg(long)]
-    server: String,
+    server: Url,
 
     /// Optional file path to a blob to upload. If omitted, a small test blob is used.
     #[arg(long)]
@@ -31,7 +30,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
     let args = Args::parse();
 
     // Create the Blossom client.
-    let client = BlossomClient::new(&args.server);
+    let client = BlossomClient::new(args.server);
     // Create signer keys from the provided private key.
     let keys = Keys::new(args.private_key);
 

crates/nostr-blossom/examples/list.rs

@@ -7,7 +7,7 @@ use nostr_blossom::prelude::*;
 struct Args {
     /// The server URL to connect to
     #[arg(long)]
-    server: String,
+    server: Url,
 
     /// The public key to list blobs for
     #[arg(long)]
@@ -21,7 +21,7 @@ struct Args {
 #[tokio::main]
 async fn main() -> Result<()> {
     let args = Args::parse();
-    let client = BlossomClient::new(&args.server);
+    let client = BlossomClient::new(args.server);
 
     // Check if a private key was provided and branch accordingly
     if let Some(private_key) = args.private_key {

crates/nostr-blossom/examples/upload.rs

@@ -10,7 +10,7 @@ use nostr_blossom::prelude::*;
 struct Args {
     /// The server URL to connect to
     #[arg(long)]
-    server: String,
+    server: Url,
 
     /// Path to the file to upload
     #[arg(long)]
@@ -29,7 +29,7 @@ struct Args {
 async fn main() -> Result<()> {
     let args = Args::parse();
 
-    let client = BlossomClient::new(&args.server);
+    let client = BlossomClient::new(args.server);
 
     // Read file data from the specified file path.
     let data = fs::read(&args.file)?;

crates/nostr-blossom/src/client.rs

@@ -25,18 +25,15 @@ use crate::error::Error;
 /// <https://github.com/hzrd149/blossom>
 #[derive(Debug, Clone)]
 pub struct BlossomClient {
-    base_url: String,
+    base_url: Url,
     client: reqwest::Client,
 }
 
 impl BlossomClient {
     /// Creates a new `BlossomClient` with the given base URL.
-    pub fn new<T>(base_url: T) -> Self
-    where
-        T: Into<String>,
-    {
+    pub fn new(base_url: Url) -> Self {
         Self {
-            base_url: base_url.into(),
+            base_url,
             client: Self::build_client().unwrap(),
         }
     }
@@ -67,7 +64,7 @@ impl BlossomClient {
         let hash: Sha256Hash = Sha256Hash::hash(&data);
         let file_hashes: Vec<Sha256Hash> = vec![hash];
 
-        let mut request = self.client.put(&url).body(data);
+        let mut request = self.client.put(url).body(data);
         let mut headers = HeaderMap::new();
 
         if let Some(ct) = content_type {
@@ -130,16 +127,14 @@ impl BlossomClient {
             url.push_str(&format!("?{}", query_params.join("&")));
         }
 
-        let mut request = self.client.get(&url);
+        let mut request = self.client.get(url);
         let mut headers = HeaderMap::new();
 
         if let Some(signer) = signer {
-            // TODO: change self.base_url type to Url
-            let url = Url::parse(&self.base_url).unwrap();
             let default_auth = self.default_auth(
                 BlossomAuthorizationVerb::List,
                 "Blossom list authorization",
-                BlossomAuthorizationScope::ServerUrl(url),
+                BlossomAuthorizationScope::ServerUrl(self.base_url.clone()),
             );
             let final_auth = authorization_options
                 .map(|opts| Self::update_authorization_fixture(&default_auth, opts))
@@ -175,7 +170,7 @@ impl BlossomClient {
         T: NostrSigner,
     {
         let url = format!("{}/{}", self.base_url, sha256);
-        let mut request = self.client.get(&url);
+        let mut request = self.client.get(url);
         let mut headers = HeaderMap::new();
 
         if let Some(range_value) = range {
@@ -231,7 +226,7 @@ impl BlossomClient {
     {
         let url = format!("{}/{}", self.base_url, sha256);
 
-        let mut request = self.client.head(&url);
+        let mut request = self.client.head(url);
 
         if let Some(signer) = signer {
             let default_auth = self.default_auth(
@@ -288,7 +283,7 @@ impl BlossomClient {
         let auth_header = Self::build_auth_header(signer, &final_auth).await?;
         headers.insert(AUTHORIZATION, auth_header);
 
-        let response: Response = self.client.delete(&url).headers(headers).send().await?;
+        let response: Response = self.client.delete(url).headers(headers).send().await?;
 
         if response.status().is_success() {
             Ok(())