feat: sort resolved addresses in backend (#33)

hrzlgnm · Mar 6, 2024 · 5e38ab9 · 5e38ab9
1 parent a185e77
commit 5e38ab9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
@@ -5,7 +5,6 @@ use log::LevelFilter;
 use mdns_sd::{ServiceDaemon, ServiceEvent};
 use serde::{Deserialize, Serialize};
 use std::{
-    collections::HashSet,
     net::IpAddr,
     sync::{Arc, Mutex},
 };
@@ -28,7 +27,7 @@ struct ResolvedService {
     instance_name: String,
     hostname: String,
     port: u16,
-    addresses: HashSet<IpAddr>,
+    addresses: Vec<IpAddr>,
 }
 
 #[tauri::command]
@@ -43,11 +42,14 @@ fn resolve_service(service_type: String, state: State<Daemon>) -> Vec<ResolvedSe
     while let Ok(event) = receiver.recv() {
         match event {
             ServiceEvent::ServiceResolved(info) => {
+                let mut sorted_addresses: Vec<IpAddr> =
+                    info.get_addresses().clone().drain().collect();
+                sorted_addresses.sort();
                 result.push(ResolvedService {
                     instance_name: info.get_fullname().into(),
                     hostname: info.get_hostname().into(),
                     port: info.get_port(),
-                    addresses: info.get_addresses().clone(),
+                    addresses: sorted_addresses,
                 });
             }
             ServiceEvent::SearchStarted(_) => {

diff --git a/src/app.rs b/src/app.rs
@@ -1,4 +1,4 @@
-use std::{collections::HashSet, net::IpAddr};
+use std::net::IpAddr;
 
 use leptos::{html::Input, *};
 use serde::{Deserialize, Serialize};
@@ -24,7 +24,7 @@ struct ResolvedService {
     instance_name: String,
     hostname: String,
     port: u16,
-    addresses: HashSet<IpAddr>,
+    addresses: Vec<IpAddr>,
 }
 type ResolvedServices = Vec<ResolvedService>;