From 78004de5e5fa79246fdf070fe7ae98fa44a75e0d Mon Sep 17 00:00:00 2001
From: fanyang <fanyang89@outlook.com>
Date: Sun, 24 Aug 2025 00:53:32 +0800
Subject: [PATCH] gui: sort peer list (#1278)

---
 easytier/src/proto/cli.rs | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/easytier/src/proto/cli.rs b/easytier/src/proto/cli.rs
index 4522871..352e74d 100644
--- a/easytier/src/proto/cli.rs
+++ b/easytier/src/proto/cli.rs
@@ -113,5 +113,43 @@ pub fn list_peer_route_pair(peers: Vec<PeerInfo>, routes: Vec<Route>) -> Vec<Pee
         pairs.push(pair);
     }
 
+    pairs.sort_by(|a, b| {
+        let a_is_public_server = a
+            .route
+            .as_ref()
+            .and_then(|r| r.feature_flag.as_ref())
+            .is_some_and(|f| f.is_public_server);
+
+        let b_is_public_server = b
+            .route
+            .as_ref()
+            .and_then(|r| r.feature_flag.as_ref())
+            .is_some_and(|f| f.is_public_server);
+
+        if a_is_public_server != b_is_public_server {
+            return if a_is_public_server {
+                std::cmp::Ordering::Less
+            } else {
+                std::cmp::Ordering::Greater
+            };
+        }
+
+        let a_ip = a
+            .route
+            .as_ref()
+            .and_then(|r| r.ipv4_addr.as_ref())
+            .and_then(|ipv4| ipv4.address.as_ref())
+            .map_or(0, |addr| addr.addr);
+
+        let b_ip = b
+            .route
+            .as_ref()
+            .and_then(|r| r.ipv4_addr.as_ref())
+            .and_then(|ipv4| ipv4.address.as_ref())
+            .map_or(0, |addr| addr.addr);
+
+        a_ip.cmp(&b_ip)
+    });
+
     pairs
 }