Skip to content

Commit

Permalink
canonicalize relay urls to avoid false duplicates
Browse files Browse the repository at this point in the history
  • Loading branch information
ksedgwic committed Oct 29, 2024
1 parent e166dc1 commit 570d64c
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 0 deletions.
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions enostr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ nostrdb = { git = "https://github.com/damus-io/nostrdb-rs", rev = "9bbafd8a2e904
hex = "0.4.3"
tracing = "0.1.40"
env_logger = "0.11.1"
url = "2.5.2"
11 changes: 11 additions & 0 deletions enostr/src/relay/pool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ use nostrdb::Filter;

use std::time::{Duration, Instant};

use url::Url;

#[cfg(not(target_arch = "wasm32"))]
use ewebsock::{WsEvent, WsMessage};

Expand Down Expand Up @@ -152,6 +154,7 @@ impl RelayPool {
url: String,
wakeup: impl Fn() + Send + Sync + Clone + 'static,
) -> Result<()> {
let url = Self::canonicalize_url(url);
// Check if the URL already exists in the pool.
if self.has(&url) {
return Ok(());
Expand All @@ -164,6 +167,14 @@ impl RelayPool {
Ok(())
}

// standardize the format (ie, trailing slashes)
fn canonicalize_url(url: String) -> String {
match Url::parse(&url) {
Ok(parsed_url) => parsed_url.to_string(),
Err(_) => url, // If parsing fails, return the original URL.
}
}

/// Attempts to receive a pool event from a list of relays. The
/// function searches each relay in the list in order, attempting to
/// receive a message from each. If a message is received, return it.
Expand Down

0 comments on commit 570d64c

Please sign in to comment.