fix: network info table and node info

Author: RickyBenevelli

README.md

@@ -1,7 +1,9 @@
-# Tauri + React + Typescript
+# Simulation Controller
 
-This template should help get you started developing with Tauri, React and Typescript in Vite.
+## Introduction
+This repository provides the RustBusters implementation for the Simulation Controller for the Advanced Programming Course 2024-2025 at the University of Trento.
+
+## Description
+Questo software è stato sviluppato utilizzando Tauri, per combinare le performance e le potenzialità di Rust con la flessibilità e la semplicità di JavaScript per fare interfaccie altamente personalizzabili. Per il frontend è stato utilizzato React, appoggiandosi a Shadcn e tailwind per la parte grafica. 
 
-## Recommended IDE Setup
 
-- [VS Code](https://code.visualstudio.com/) + [Tauri](https://marketplace.visualstudio.com/items?itemName=tauri-apps.tauri-vscode) + [rust-analyzer](https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer)

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "react-sc",
+  "name": "simulation-controller",
   "private": true,
   "version": "0.1.0",
   "type": "module",

src-tauri/src/commands/topology.rs

@@ -68,7 +68,7 @@ pub fn add_node(
     node_type: String, // Drone, Client, Server
 ) -> Result<(), NetworkError> {
     let mut sim_state = state.lock();
-    
+
     let node_type = match node_type.as_str() {
         "Drone" => NodeType::Drone,
         "Client" => NodeType::Client,
@@ -214,10 +214,11 @@ pub fn get_network_nodes(state: State<Arc<Mutex<SimulationState>>>) -> Result<Va
         return Err(NetworkError::NetworkNotRunning);
     }
 
-    let nodes_json: Vec<Value> = sim_state
-        .get_graph()
-        .get_nodes_info()
-        .iter()
+    let mut nodes_info: Vec<_> = sim_state.get_graph().get_nodes_info().into_iter().collect();
+    nodes_info.sort_by_key(|(node_id, _)| *node_id);
+
+    let nodes_json: Vec<Value> = nodes_info
+        .into_iter()
         .map(|(node_id, metadata)| match metadata {
             crate::simulation::topology::NodeMetadata::Drone(drone) => {
                 json!({

src-tauri/src/lib.rs

@@ -27,7 +27,7 @@ pub fn run() {
                 if cfg!(debug_assertions) {
                     app.handle().plugin(
                         tauri_plugin_log::Builder::default()
-                            .level(log::LevelFilter::Info)
+                            .level(log::LevelFilter::Off)
                             // .filter(|metadata| metadata.target().starts_with("reactsc"))
                             .build(),
                     )?;

src-tauri/src/simulation/initializer/network_initializer.rs

@@ -12,7 +12,7 @@ use server::utils::traits::Runnable;
 use server::{RustBustersServer, RustBustersServerController};
 use std::collections::HashMap;
 use std::net::Ipv4Addr;
-use std::{env, thread};
+use std::{thread};
 use wg_2024::controller::{DroneCommand, DroneEvent};
 use wg_2024::drone::Drone;
 use wg_2024::network::NodeId;

src-tauri/src/simulation/metrics/metrics_handler.rs

@@ -1,4 +1,6 @@
-use crate::simulation::metrics::{DroneMetrics, HostMetrics, HostMetricsTimePoint, Metrics, MetricsTimePoint, PacketTypeLabel};
+use crate::simulation::metrics::{
+    DroneMetrics, HostMetrics, HostMetricsTimePoint, Metrics, MetricsTimePoint, PacketTypeLabel,
+};
 use common_utils::PacketTypeHeader;
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 use wg_2024::network::NodeId;
@@ -51,7 +53,7 @@ impl Metrics {
     pub fn update_host_message_sent(
         &mut self,
         node_id: NodeId,
-        destination: NodeId,
+        _destination: NodeId,
         latency: Duration,
     ) {
         if let Some(host_metrics) = self.host_metrics.get_mut(&node_id) {
@@ -85,7 +87,6 @@ impl Metrics {
     }
 }
 
-
 impl crate::simulation::metrics::HostMetrics {
     pub fn record_packet(&mut self, dest: NodeId, packet_type: PacketTypeLabel) {
         let entry = self.dest_stats.entry(dest).or_insert((0, 0));
@@ -145,7 +146,6 @@ impl crate::simulation::metrics::HostMetrics {
     }
 }
 
-
 impl crate::simulation::metrics::DroneMetrics {
     pub fn number_of_packets_sent(&self) -> u64 {
         self.packet_type_counts.values().sum()
@@ -198,4 +198,4 @@ impl crate::simulation::metrics::DroneMetrics {
     pub fn record_shortcut(&mut self) {
         self.shortcuts += 1;
     }
-}
+}

src-tauri/src/simulation/metrics/mod.rs

@@ -7,7 +7,7 @@ use std::time::Duration;
 use wg_2024::network::NodeId;
 use wg_2024::packet::PacketType;
 
-const ROLLING_WINDOW_SIZE: usize = 100;
+const ROLLING_WINDOW_SIZE: usize = 1000;
 
 #[derive(Debug, Default)]
 pub struct Metrics {
@@ -52,16 +52,22 @@ impl From<&PacketType> for crate::simulation::metrics::PacketTypeLabel {
             PacketType::MsgFragment(_) => crate::simulation::metrics::PacketTypeLabel::MsgFragment,
             PacketType::Ack(_) => crate::simulation::metrics::PacketTypeLabel::Ack,
             PacketType::Nack(_) => crate::simulation::metrics::PacketTypeLabel::Nack,
-            PacketType::FloodRequest(_) => crate::simulation::metrics::PacketTypeLabel::FloodRequest,
-            PacketType::FloodResponse(_) => crate::simulation::metrics::PacketTypeLabel::FloodResponse,
+            PacketType::FloodRequest(_) => {
+                crate::simulation::metrics::PacketTypeLabel::FloodRequest
+            }
+            PacketType::FloodResponse(_) => {
+                crate::simulation::metrics::PacketTypeLabel::FloodResponse
+            }
         }
     }
 }
 
 impl From<&PacketTypeHeader> for crate::simulation::metrics::PacketTypeLabel {
     fn from(pt: &PacketTypeHeader) -> Self {
         match pt {
-            PacketTypeHeader::MsgFragment => crate::simulation::metrics::PacketTypeLabel::MsgFragment,
+            PacketTypeHeader::MsgFragment => {
+                crate::simulation::metrics::PacketTypeLabel::MsgFragment
+            }
             PacketTypeHeader::Ack => crate::simulation::metrics::PacketTypeLabel::Ack,
             PacketTypeHeader::FloodRequest => {
                 crate::simulation::metrics::PacketTypeLabel::FloodRequest

src-tauri/tauri.conf.json

@@ -1,8 +1,8 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
-  "productName": "react-sc",
-  "version": "0.1.0",
-  "identifier": "com.react-sc.app",
+  "productName": "Simulation Controller",
+  "version": "1.0.0",
+  "identifier": "com.riccardobenevelli.simulation-controller",
   "build": {
     "beforeDevCommand": "bun run dev",
     "devUrl": "http://localhost:1420",
@@ -12,7 +12,7 @@
   "app": {
     "windows": [
       {
-        "title": "react-sc",
+        "title": "Simulation Controller",
         "width": 1200,
         "height": 800
       }

src/components/GraphComponent.tsx

@@ -15,7 +15,7 @@ import {
 } from "@/components/ui/dialog";
 import { Input } from "@/components/ui/input";
 import { Checkbox } from "@/components/ui/checkbox";
-import { getCssVariableAsRGB } from "@/lib/utils";
+import { extractErrorMessage, getCssVariableAsRGB } from "@/lib/utils";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 
 interface GraphComponentProps {
@@ -342,7 +342,7 @@ const GraphComponent = ({ onNodeSelect, setRefreshGraph }: GraphComponentProps)
       await loadGraphData();
     } catch (error: any) {
       console.error("Error while adding the node:", error);
-      const errorMessage = error?.message || "Error while adding the node.";
+      const errorMessage = extractErrorMessage(error);
       toast.error(errorMessage);
     }
   };
@@ -422,9 +422,9 @@ const GraphComponent = ({ onNodeSelect, setRefreshGraph }: GraphComponentProps)
             <div className="flex flex-wrap gap-2 mt-1">
               { cy &&
                 cy.nodes().sort((a, b) => {
-                  const idA = parseInt(a.id(), 10); // Converti l'ID in numero
+                  const idA = parseInt(a.id(), 10);
                   const idB = parseInt(b.id(), 10);
-                  return idA - idB; // Ordine numerico crescente
+                  return idA - idB;
                 }).map((node) => (
                   <label key={ node.id() } className="flex items-center gap-2">
                     <Checkbox