Skip to content

Commit 828789a

Browse files
ramfox“ramfox”
andauthored
feat: add new NA west default relay (#3599)
## Description Adds a default relay in the NA west region. --------- Co-authored-by: “ramfox” <“[email protected]”>
1 parent 406bfde commit 828789a

File tree

3 files changed

+35
-16
lines changed

3 files changed

+35
-16
lines changed

iroh/src/defaults.rs

Lines changed: 32 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,41 @@ pub mod prod {
2222

2323
use super::*;
2424

25-
/// Hostname of the default NA relay.
26-
pub const NA_RELAY_HOSTNAME: &str = "use1-1.relay.n0.iroh-canary.iroh.link.";
25+
/// Hostname of the default NA east relay.
26+
pub const NA_EAST_RELAY_HOSTNAME: &str = "use1-1.relay.n0.iroh-canary.iroh.link.";
27+
/// Hostname of the default NA west relay.
28+
pub const NA_WEST_RELAY_HOSTNAME: &str = "https://usw1-1.relay.n0.iroh-canary.iroh.link.";
2729
/// Hostname of the default EU relay.
2830
pub const EU_RELAY_HOSTNAME: &str = "euc1-1.relay.n0.iroh-canary.iroh.link.";
2931
/// Hostname of the default Asia-Pacific relay.
3032
pub const AP_RELAY_HOSTNAME: &str = "aps1-1.relay.n0.iroh-canary.iroh.link.";
3133

3234
/// Get the default [`RelayMap`].
3335
pub fn default_relay_map() -> RelayMap {
34-
RelayMap::from_iter([default_na_relay(), default_eu_relay(), default_ap_relay()])
36+
RelayMap::from_iter([
37+
default_na_east_relay(),
38+
default_na_west_relay(),
39+
default_eu_relay(),
40+
default_ap_relay(),
41+
])
42+
}
43+
44+
/// Get the default [`RelayConfig`] for NA east.
45+
pub fn default_na_east_relay() -> RelayConfig {
46+
// The default NA east relay server run by number0.
47+
let url: Url = format!("https://{NA_EAST_RELAY_HOSTNAME}")
48+
.parse()
49+
.expect("default url");
50+
RelayConfig {
51+
url: url.into(),
52+
quic: Some(RelayQuicConfig::default()),
53+
}
3554
}
3655

37-
/// Get the default [`RelayConfig`] for NA.
38-
pub fn default_na_relay() -> RelayConfig {
39-
// The default NA relay server run by number0.
40-
let url: Url = format!("https://{NA_RELAY_HOSTNAME}")
56+
/// Get the default [`RelayConfig`] for NA west.
57+
pub fn default_na_west_relay() -> RelayConfig {
58+
// The default NA west relay server run by number0.
59+
let url: Url = format!("https://{NA_WEST_RELAY_HOSTNAME}")
4160
.parse()
4261
.expect("default url");
4362
RelayConfig {
@@ -82,19 +101,19 @@ pub mod staging {
82101
use super::*;
83102

84103
/// Hostname of the default NA relay.
85-
pub const NA_RELAY_HOSTNAME: &str = "staging-use1-1.relay.iroh.network.";
104+
pub const NA_EAST_RELAY_HOSTNAME: &str = "staging-use1-1.relay.iroh.network.";
86105
/// Hostname of the default EU relay.
87106
pub const EU_RELAY_HOSTNAME: &str = "staging-euw1-1.relay.iroh.network.";
88107

89108
/// Get the default [`RelayMap`].
90109
pub fn default_relay_map() -> RelayMap {
91-
RelayMap::from_iter([default_na_relay(), default_eu_relay()])
110+
RelayMap::from_iter([default_na_east_relay(), default_eu_relay()])
92111
}
93112

94-
/// Get the default [`RelayConfig`] for NA.
95-
pub fn default_na_relay() -> RelayConfig {
96-
// The default NA relay server run by number0.
97-
let url: Url = format!("https://{NA_RELAY_HOSTNAME}")
113+
/// Get the default [`RelayConfig`] for NA east.
114+
pub fn default_na_east_relay() -> RelayConfig {
115+
// The default NA east relay server run by number0.
116+
let url: Url = format!("https://{NA_EAST_RELAY_HOSTNAME}")
98117
.parse()
99118
.expect("default url");
100119
RelayConfig {

iroh/src/dns.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pub(crate) mod tests {
1818
use tracing_test::traced_test;
1919

2020
use super::DnsResolver;
21-
use crate::defaults::staging::NA_RELAY_HOSTNAME;
21+
use crate::defaults::staging::NA_EAST_RELAY_HOSTNAME;
2222

2323
const TIMEOUT: Duration = Duration::from_secs(5);
2424
const STAGGERING_DELAYS: &[u64] = &[200, 300];
@@ -28,7 +28,7 @@ pub(crate) mod tests {
2828
async fn test_dns_lookup_ipv4_ipv6() {
2929
let resolver = DnsResolver::new();
3030
let res: Vec<_> = resolver
31-
.lookup_ipv4_ipv6_staggered(NA_RELAY_HOSTNAME, TIMEOUT, STAGGERING_DELAYS)
31+
.lookup_ipv4_ipv6_staggered(NA_EAST_RELAY_HOSTNAME, TIMEOUT, STAGGERING_DELAYS)
3232
.await
3333
.unwrap()
3434
.collect();

iroh/src/magicsock/transports/relay.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ mod tests {
399399
async fn test_relay_datagram_queue() {
400400
let capacity = 16;
401401
let (sender, mut receiver) = mpsc::channel(capacity);
402-
let url = staging::default_na_relay().url;
402+
let url = staging::default_na_east_relay().url;
403403

404404
let mut tasks = JoinSet::new();
405405

0 commit comments

Comments
 (0)