From 6ea3adcef8524406bfbce5d1c4fd7b21cfbba907 Mon Sep 17 00:00:00 2001
From: m1m1sha <56671041+m1m1sha@users.noreply.github.com>
Date: Wed, 11 Sep 2024 15:58:13 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20show=20version=20&=20local?=
 =?UTF-8?q?=20node=20(#318)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ✨ feat: version

Add display version information, incompatible with lower versions

* 🎈 perf: unknown

Unknown when there is no version number displayed

* ✨ feat: Display local nodes

Display local nodes, incompatible with lower versions
---
 easytier-gui/locales/cn.yml            |  4 ++
 easytier-gui/locales/en.yml            |  4 ++
 easytier-gui/src/components/Status.vue | 32 +++++++++----
 easytier-gui/src/types/network.ts      |  3 ++
 easytier/proto/cli.proto               |  2 +
 easytier/src/easytier-cli.rs           | 66 ++++++++++++++++++++++++++
 easytier/src/launcher.rs               |  4 ++
 easytier/src/peers/peer_conn.rs        |  9 +---
 easytier/src/peers/peer_manager.rs     |  1 +
 easytier/src/peers/peer_ospf_route.rs  |  1 +
 10 files changed, 110 insertions(+), 16 deletions(-)

diff --git a/easytier-gui/locales/cn.yml b/easytier-gui/locales/cn.yml
index d59d3e7..6a7fcd7 100644
--- a/easytier-gui/locales/cn.yml
+++ b/easytier-gui/locales/cn.yml
@@ -66,6 +66,10 @@ upload_bytes: 上传
 download_bytes: 下载
 loss_rate: 丢包率
 
+status:
+  version: 内核版本
+  local: 本机
+
 run_network: 运行网络
 stop_network: 停止网络
 network_running: 运行中
diff --git a/easytier-gui/locales/en.yml b/easytier-gui/locales/en.yml
index cd5d376..f4ddd9a 100644
--- a/easytier-gui/locales/en.yml
+++ b/easytier-gui/locales/en.yml
@@ -66,6 +66,10 @@ upload_bytes: Upload
 download_bytes: Download
 loss_rate: Loss Rate
 
+status:
+  version: Version
+  local: Local
+
 run_network: Run Network
 stop_network: Stop Network
 network_running: running
diff --git a/easytier-gui/src/components/Status.vue b/easytier-gui/src/components/Status.vue
index cbffc68..67b013e 100644
--- a/easytier-gui/src/components/Status.vue
+++ b/easytier-gui/src/components/Status.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { NodeInfo } from '~/types/network'
+import type { NodeInfo, PeerRoutePair } from '~/types/network'
 
 const props = defineProps<{
   instanceId?: string
@@ -25,13 +25,24 @@ const curNetworkInst = computed(() => {
 })
 
 const peerRouteInfos = computed(() => {
-  if (curNetworkInst.value)
-    return curNetworkInst.value.detail?.peer_route_pairs || []
+  if (curNetworkInst.value) {
+    const my_node_info = curNetworkInst.value.detail?.my_node_info
+    return [{
+      route: {
+        ipv4_addr: my_node_info?.virtual_ipv4,
+        hostname: my_node_info?.hostname,
+        version: my_node_info?.version,
+      },
+    }, ...(curNetworkInst.value.detail?.peer_route_pairs || [])]
+  }
 
   return []
 })
 
 function routeCost(info: any) {
+  if (!info.peer)
+    return t('status.local')
+
   if (info.route) {
     const cost = info.route.cost
     return cost === 1 ? 'p2p' : `relay(${cost})`
@@ -74,29 +85,33 @@ function humanFileSize(bytes: number, si = false, dp = 1) {
   return `${bytes.toFixed(dp)} ${units[u]}`
 }
 
-function latencyMs(info: any) {
+function latencyMs(info: PeerRoutePair) {
   let lat_us_sum = statsCommon(info, 'stats.latency_us')
   if (lat_us_sum === undefined)
     return ''
-  lat_us_sum = lat_us_sum / 1000 / info.peer.conns.length
+  lat_us_sum = lat_us_sum / 1000 / info.peer!.conns.length
   return `${lat_us_sum % 1 > 0 ? Math.round(lat_us_sum) + 1 : Math.round(lat_us_sum)}ms`
 }
 
-function txBytes(info: any) {
+function txBytes(info: PeerRoutePair) {
   const tx = statsCommon(info, 'stats.tx_bytes')
   return tx ? humanFileSize(tx) : ''
 }
 
-function rxBytes(info: any) {
+function rxBytes(info: PeerRoutePair) {
   const rx = statsCommon(info, 'stats.rx_bytes')
   return rx ? humanFileSize(rx) : ''
 }
 
-function lossRate(info: any) {
+function lossRate(info: PeerRoutePair) {
   const lossRate = statsCommon(info, 'loss_rate')
   return lossRate !== undefined ? `${Math.round(lossRate * 100)}%` : ''
 }
 
+function version(info: PeerRoutePair) {
+  return info.route.version === '' ? 'unknown' : info.route.version
+}
+
 const myNodeInfo = computed(() => {
   if (!curNetworkInst.value)
     return {} as NodeInfo
@@ -374,6 +389,7 @@ function showEventLogs() {
             <Column :field="txBytes" style="width: 80px;" :header="t('upload_bytes')" />
             <Column :field="rxBytes" style="width: 80px;" :header="t('download_bytes')" />
             <Column :field="lossRate" style="width: 100px;" :header="t('loss_rate')" />
+            <Column :field="version" style="width: 100px;" :header="t('status.version')" />
           </DataTable>
         </template>
       </Card>
diff --git a/easytier-gui/src/types/network.ts b/easytier-gui/src/types/network.ts
index f200c0e..17cb6ef 100644
--- a/easytier-gui/src/types/network.ts
+++ b/easytier-gui/src/types/network.ts
@@ -87,6 +87,8 @@ export interface NetworkInstanceRunningInfo {
 
 export interface NodeInfo {
   virtual_ipv4: string
+  hostname: string
+  version: string
   ips: {
     public_ipv4: string
     interface_ipv4s: string[]
@@ -125,6 +127,7 @@ export interface Route {
   hostname: string
   stun_info?: StunInfo
   inst_id: string
+  version: string
 }
 
 export interface PeerInfo {
diff --git a/easytier/proto/cli.proto b/easytier/proto/cli.proto
index f422381..1a56f1f 100644
--- a/easytier/proto/cli.proto
+++ b/easytier/proto/cli.proto
@@ -76,6 +76,7 @@ message Route {
   string hostname = 6;
   StunInfo stun_info = 7;
   string inst_id = 8;
+  string version = 9;
 }
 
 message NodeInfo {
@@ -87,6 +88,7 @@ message NodeInfo {
   string inst_id = 6;
   repeated string listeners = 7;
   string config = 8;
+  string version = 9;
 }
 
 message ShowNodeInfoRequest {}
diff --git a/easytier/src/easytier-cli.rs b/easytier/src/easytier-cli.rs
index 2a731ea..a61654d 100644
--- a/easytier/src/easytier-cli.rs
+++ b/easytier/src/easytier-cli.rs
@@ -197,6 +197,7 @@ impl CommandHandler {
             tunnel_proto: String,
             nat_type: String,
             id: String,
+            version: String,
         }
 
         impl From<PeerRoutePair> for PeerTableItem {
@@ -212,6 +213,33 @@ impl CommandHandler {
                     tunnel_proto: p.get_conn_protos().unwrap_or(vec![]).join(",").to_string(),
                     nat_type: p.get_udp_nat_type(),
                     id: p.route.peer_id.to_string(),
+                    version: if p.route.version.is_empty() {
+                        "unknown".to_string()
+                    } else {
+                        p.route.version.to_string()
+                    },
+                }
+            }
+        }
+
+        impl From<NodeInfo> for PeerTableItem {
+            fn from(p: NodeInfo) -> Self {
+                PeerTableItem {
+                    ipv4: p.ipv4_addr.clone(),
+                    hostname: p.hostname.clone(),
+                    cost: "Local".to_string(),
+                    lat_ms: "-".to_string(),
+                    loss_rate: "-".to_string(),
+                    rx_bytes: "-".to_string(),
+                    tx_bytes: "-".to_string(),
+                    tunnel_proto: "-".to_string(),
+                    nat_type: if let Some(info) = p.stun_info {
+                        info.udp_nat_type().as_str_name().to_string()
+                    } else {
+                        "Unknown".to_string()
+                    },
+                    id: p.peer_id.to_string(),
+                    version: p.version,
                 }
             }
         }
@@ -223,6 +251,15 @@ impl CommandHandler {
             return Ok(());
         }
 
+        let mut client = self.get_peer_manager_client().await?;
+        let node_info = client
+            .show_node_info(ShowNodeInfoRequest::default())
+            .await?
+            .into_inner()
+            .node_info
+            .ok_or(anyhow::anyhow!("node info not found"))?;
+        items.push(node_info.into());
+
         for p in peer_routes {
             items.push(p.into());
         }
@@ -293,9 +330,28 @@ impl CommandHandler {
             next_hop_hostname: String,
             next_hop_lat: f64,
             cost: i32,
+            version: String,
         }
 
         let mut items: Vec<RouteTableItem> = vec![];
+        let mut client = self.get_peer_manager_client().await?;
+        let node_info = client
+            .show_node_info(ShowNodeInfoRequest::default())
+            .await?
+            .into_inner()
+            .node_info
+            .ok_or(anyhow::anyhow!("node info not found"))?;
+
+        items.push(RouteTableItem {
+            ipv4: node_info.ipv4_addr.clone(),
+            hostname: node_info.hostname.clone(),
+            proxy_cidrs: node_info.proxy_cidrs.join(", "),
+            next_hop_ipv4: "-".to_string(),
+            next_hop_hostname: "Local".to_string(),
+            next_hop_lat: 0.0,
+            cost: 0,
+            version: node_info.version.clone(),
+        });
         let peer_routes = self.list_peer_route_pair().await?;
         for p in peer_routes.iter() {
             let Some(next_hop_pair) = peer_routes
@@ -314,6 +370,11 @@ impl CommandHandler {
                     next_hop_hostname: "".to_string(),
                     next_hop_lat: next_hop_pair.get_latency_ms().unwrap_or(0.0),
                     cost: p.route.cost,
+                    version: if p.route.version.is_empty() {
+                        "unknown".to_string()
+                    } else {
+                        p.route.version.to_string()
+                    },
                 });
             } else {
                 items.push(RouteTableItem {
@@ -324,6 +385,11 @@ impl CommandHandler {
                     next_hop_hostname: next_hop_pair.route.hostname.clone(),
                     next_hop_lat: next_hop_pair.get_latency_ms().unwrap_or(0.0),
                     cost: p.route.cost,
+                    version: if p.route.version.is_empty() {
+                        "unknown".to_string()
+                    } else {
+                        p.route.version.to_string()
+                    },
                 });
             }
         }
diff --git a/easytier/src/launcher.rs b/easytier/src/launcher.rs
index 03d9381..9545f6f 100644
--- a/easytier/src/launcher.rs
+++ b/easytier/src/launcher.rs
@@ -24,6 +24,8 @@ use tokio::task::JoinSet;
 #[derive(Default, Clone, Debug, Serialize, Deserialize)]
 pub struct MyNodeInfo {
     pub virtual_ipv4: String,
+    pub hostname: String,
+    pub version: String,
     pub ips: GetIpListResponse,
     pub stun_info: StunInfo,
     pub listeners: Vec<String>,
@@ -137,6 +139,8 @@ impl EasyTierLauncher {
                         .get_ipv4()
                         .map(|x| x.to_string())
                         .unwrap_or_default(),
+                    hostname: global_ctx_c.get_hostname(),
+                    version: env!("CARGO_PKG_VERSION").to_string(),
                     ips: global_ctx_c.get_ip_collector().collect_ip_addrs().await,
                     stun_info: global_ctx_c.get_stun_info_collector().get_stun_info(),
                     listeners: global_ctx_c
diff --git a/easytier/src/peers/peer_conn.rs b/easytier/src/peers/peer_conn.rs
index a842cea..051f372 100644
--- a/easytier/src/peers/peer_conn.rs
+++ b/easytier/src/peers/peer_conn.rs
@@ -30,14 +30,7 @@ use crate::{
         PeerId,
     },
     rpc::{HandshakeRequest, PeerConnInfo, PeerConnStats, TunnelInfo},
-    tunnel::packet_def::PacketType,
-    tunnel::{
-        filter::{StatsRecorderTunnelFilter, TunnelFilter, TunnelWithFilter},
-        mpsc::{MpscTunnel, MpscTunnelSender},
-        packet_def::ZCPacket,
-        stats::{Throughput, WindowLatency},
-        Tunnel, TunnelError, ZCPacketStream,
-    },
+    tunnel::{filter::{StatsRecorderTunnelFilter, TunnelFilter, TunnelWithFilter}, mpsc::{MpscTunnel, MpscTunnelSender}, packet_def::{PacketType, ZCPacket}, stats::{Throughput, WindowLatency}, Tunnel, TunnelError, ZCPacketStream},
 };
 
 use super::{peer_conn_ping::PeerConnPinger, PacketRecvChan};
diff --git a/easytier/src/peers/peer_manager.rs b/easytier/src/peers/peer_manager.rs
index 32d66be..32601a2 100644
--- a/easytier/src/peers/peer_manager.rs
+++ b/easytier/src/peers/peer_manager.rs
@@ -771,6 +771,7 @@ impl PeerManager {
                 .map(|x| x.to_string())
                 .collect(),
             config: self.global_ctx.config.dump(),
+            version: env!("CARGO_PKG_VERSION").to_string(),
         }
     }
 }
diff --git a/easytier/src/peers/peer_ospf_route.rs b/easytier/src/peers/peer_ospf_route.rs
index 5a40428..22110bf 100644
--- a/easytier/src/peers/peer_ospf_route.rs
+++ b/easytier/src/peers/peer_ospf_route.rs
@@ -163,6 +163,7 @@ impl Into<crate::rpc::Route> for RoutePeerInfo {
                 Some(stun_info)
             },
             inst_id: self.inst_id.to_string(),
+            version: env!("CARGO_PKG_VERSION").to_string(),
         }
     }
 }