studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Reduce join-server selection randomness with separated sets.

Browse Source 
Keep alias server biased at the front unless configured deprioritized.

Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-12-02 06:28:50 +00:00
parent f311332bad
commit cab0b3fd9f
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/api/client/membership/mod.rs
View File

@@ -151,7 +151,7 @@ async fn get_join_params(
via: &[OwnedServerName], via: &[OwnedServerName],
) -> Result<(OwnedRoomId, Vec<OwnedServerName>)> { ) -> Result<(OwnedRoomId, Vec<OwnedServerName>)> {
// servers tried first, additional_servers shuffled then tried after // servers tried first, additional_servers shuffled then tried after
let (room_id, mut servers, mut additional_servers) = let (room_id, mut primary_servers, mut additional_servers) =
match OwnedRoomId::try_from(room_id_or_alias.to_owned()) { match OwnedRoomId::try_from(room_id_or_alias.to_owned()) {
// if room id, shuffle via + room_id server_name ... // if room id, shuffle via + room_id server_name ...
| Ok(room_id) => { | Ok(room_id) => {
@@ -194,11 +194,23 @@ async fn get_join_params(
.map(|user| user.server_name().to_owned()), .map(|user| user.server_name().to_owned()),
); );
primary_servers.sort_unstable();
primary_servers.dedup();
shuffle(&mut primary_servers);
// shuffle additionals, append to base servers // shuffle additionals, append to base servers
servers.append(&mut additional_servers); additional_servers.sort_unstable();
servers.sort_unstable(); additional_servers.dedup();
servers.dedup(); shuffle(&mut additional_servers);
shuffle(&mut servers);
let mut servers: Vec<_> = room_id_or_alias
.server_name()
.filter(|_| room_id_or_alias.is_room_alias_id())
.map(ToOwned::to_owned)
.into_iter()
.chain(primary_servers.into_iter())
.chain(additional_servers.into_iter())
.collect();
// sort deprioritized servers last // sort deprioritized servers last
servers.sort_by(|a, b| { servers.sort_by(|a, b| {
@@ -207,6 +219,7 @@ async fn get_join_params(
.config .config
.deprioritize_joins_through_servers .deprioritize_joins_through_servers
.is_match(a.host()); .is_match(a.host());
let b_matches = services let b_matches = services
.server .server
.config .config