fix: client URL parsing (#14)

WalletConnect · Mar 16, 2023 · 7f08502 · 7f08502
1 parent ced99e7
commit 7f08502
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/relay_client/Cargo.toml b/relay_client/Cargo.toml
@@ -21,3 +21,4 @@ tokio-stream = "0.1"
 tokio-util = "0.7"
 pin-project = "1.0"
 chrono = { version = "0.4", default-features = false, features = ["alloc", "std"] }
+url = "2.3"
diff --git a/relay_client/src/errors.rs b/relay_client/src/errors.rs
@@ -29,6 +29,9 @@ pub enum RequestBuildError {
     #[error("Failed to add request headers")]
     Headers,
 
+    #[error("Failed to parse connection URL: {0}")]
+    Url(#[from] url::ParseError),
+
     #[error("Failed to create websocket request: {0}")]
     Other(WsError),
 }

diff --git a/relay_client/src/lib.rs b/relay_client/src/lib.rs
@@ -7,6 +7,7 @@ use {
     },
     serde::Serialize,
     tokio_tungstenite::tungstenite::{client::IntoClientRequest, http},
+    url::Url,
 };
 
 mod client;
@@ -102,7 +103,10 @@ impl ConnectionOptions {
             serde_qs::to_string(&query).map_err(RequestBuildError::Query)?
         };
 
-        let mut request = format!("{address}/?{query}")
+        let mut url = Url::parse(&address).map_err(RequestBuildError::Url)?;
+        url.set_query(Some(&query));
+
+        let mut request = url
             .into_client_request()
             .map_err(RequestBuildError::Other)?;