progress bar

client-gui/src/gui_app.rs

@@ -1,13 +1,13 @@
 use client_network::{
     ChunkNode, MerkleNode, MerkleTree, NetworkCommand, NetworkEvent, NodeHash,
     big_or_chunk_to_file, filename_to_string, generate_base_tree, node_hash_to_hex_string,
-    remove_null_bytes,
+    node_to_file, remove_null_bytes,
 };
 use crossbeam_channel::{Receiver, Sender};
 use egui::{
-    Align, Align2, Button, CentralPanel, CollapsingHeader, Context, Id, LayerId, Layout, Order,
+    Align, CentralPanel, CollapsingHeader, Color32, Context, CornerRadius, Frame, Layout,
-    Popup, ScrollArea, SidePanel, TextStyle, TopBottomPanel, Ui, ViewportCommand,
+    ProgressBar, Response, ScrollArea, SidePanel, Stroke, TopBottomPanel, Ui, Vec2,
-    debug_text::print,
+    ViewportCommand,
 };
 use std::collections::HashSet;
 use std::{collections::HashMap, fmt::format, io::Seek};
@@ -33,6 +33,7 @@ pub struct P2PClientApp {
     // GUI State
     status_message: String,
     known_peers: Vec<(String, bool)>,
+    loading_peers: Vec<String>,
     connect_address_input: String,
     connected_address: String,
     connect_name_input: String,
@@ -48,11 +49,19 @@ pub struct P2PClientApp {
 
     show_network_popup: bool, // gérer selon besoin
 
-    error_message: Option<String>, // Some(message) -> afficher, None -> rien
+    error_message: Option<(String, String)>, // Some(message) -> afficher, None -> rien
+    success_message: Option<(String, String)>, // Some(message) -> afficher, None -> rien
     active_server: String,
 
     current_downloading_file_map: MerkleTree,
     remaining_chunks: HashSet<[u8; 32]>,
+
+    // total number of chunks expected for the current download (set when download starts)
+    current_total_chunks: Option<usize>,
+
+    // number of chunks received so far (count of removed remaining_chunks)
+    current_received_chunks: usize,
+
     root_downloading_file: String,
 }
 
@@ -72,7 +81,8 @@ impl P2PClientApp {
             network_cmd_tx: cmd_tx,
             network_event_rx: event_rx,
             status_message: "Client Initialized. Awaiting network status...".to_string(),
-            known_peers: vec![("bob".to_string(), true)],
+            known_peers: Vec::new(),
+            loading_peers: Vec::new(),
             connect_address_input: "https://jch.irif.fr:8443".to_string(),
             connected_address: "".to_string(),
             loaded_fs,
@@ -80,20 +90,37 @@ impl P2PClientApp {
             server_status: ServerStatus::NotConnected,
             show_network_popup: false,
             error_message: None,
+            success_message: None,
             connect_name_input: "bob".to_string(),
             active_server: "".to_string(),
             shared_tree: generate_base_tree(),
             current_downloading_file_map: current_downloading_file_map,
+            current_total_chunks: None,
+            current_received_chunks: 0,
             root_downloading_file: "".to_string(),
             remaining_chunks: HashSet::new(),
         }
     }
-    pub fn show_error(&mut self, msg: impl Into<String>) {
+    pub fn show_error(&mut self, msg: impl Into<String>, peer_username: impl Into<String>) {
-        self.error_message = Some(msg.into());
+        self.error_message = Some((msg.into(), peer_username.into()));
+    }
+    pub fn show_success(&mut self, msg: impl Into<String>, peer_username: impl Into<String>) {
+        self.success_message = Some((msg.into(), peer_username.into()));
     }
     pub fn clear_error(&mut self) {
         self.error_message = None;
     }
+    pub fn clear_success(&mut self) {
+        self.success_message = None;
+    }
+
+    fn set_current_total_chunks(&mut self, len: Option<usize>) {
+        self.current_total_chunks = len
+    }
+
+    fn set_current_received_chunks(&mut self, arg: usize) {
+        self.current_received_chunks = arg
+    }
 }
 
 // --- eframe::App Trait Implementation ---
@@ -245,13 +272,15 @@ impl eframe::App for P2PClientApp {
                     self.known_peers.clear();
                     self.server_status = ServerStatus::NotConnected;
                 }
-                NetworkEvent::Error(err) => {
+                NetworkEvent::Error(err, peer_username) => {
-                    self.show_error(err);
+                    self.loading_peers.retain(|s| s != peer_username.as_str());
+                    self.show_error(err, peer_username);
                 }
-                NetworkEvent::InitDownload(hash, ip) => {
+                NetworkEvent::InitDownload(hash, ip, name) => {
                     if let Some(addr) = &self.active_peer {
                         if let Some(roottree) = self.loaded_fs.get(addr) {
                             if let Some(root) = roottree.data.get(&hash) {
+                                self.root_downloading_file = name;
                                 let _ = self
                                     .current_downloading_file_map
                                     .data
@@ -280,6 +309,7 @@ impl eframe::App for P2PClientApp {
                                     true,
                                 ));
                                 self.remaining_chunks.insert(entry);
+                                self.set_current_total_chunks(Some(self.remaining_chunks.len()));
                             }
                             self.remaining_chunks.remove(&hash);
                         }
@@ -288,16 +318,52 @@ impl eframe::App for P2PClientApp {
                         }
                         _ => {}
                     }
+
+                    if let Some(total) = self.current_total_chunks {
+                        // recompute received (safer than incrementing)
+                        let received = total.saturating_sub(self.remaining_chunks.len());
+                        self.current_received_chunks = received;
+                    }
+
                     if self.remaining_chunks.is_empty() {
+                        /*let file = OpenOptions::new()
+                            .append(true)
+                            .create(true)
+                            .open(self.root_downloading_file.clone());
+
+                        if let Some(current) = self
+                            .current_downloading_file_map
+                            .data
+                            .get(&self.current_downloading_file_map.root)
+                        {
+                            match file {
+                                Ok(mut fileok) => {
+                                    big_or_chunk_to_file(
+                                        &self.current_downloading_file_map,
+                                        current,
+                                        &mut fileok,
+                                    );
+                                }
+                                Err(e) => {
+                                    eprintln!("error creaation file: {}", e);
+                                }
+                            }
+                        }*/
+                        self.current_total_chunks = None;
+                        self.current_received_chunks = 0;
                         println!("bigfile téléchargé");
                     }
                 }
+                NetworkEvent::Success(msg, peer_username) => {
+                    self.loading_peers.retain(|s| s != peer_username.as_str());
+                    self.show_success(msg, peer_username);
+                }
                 NetworkEvent::HandshakeFailed() => {}
                 NetworkEvent::ServerHandshakeFailed(err) => {
                     self.active_server = "".to_string();
                     self.server_status = ServerStatus::NotConnected;
                     let err_msg = format!("Failed to connect to the server: {}", err);
-                    self.show_error(err_msg);
+                    self.show_error(err_msg, "");
                     let res = self.network_cmd_tx.send(NetworkCommand::ResetServerPeer());
                 }
             }
@@ -365,26 +431,35 @@ impl eframe::App for P2PClientApp {
         TopBottomPanel::bottom("bottom_panel").show(ctx, |ui| {
             ui.horizontal(|ui| {
                 match self.server_status {
-                    ServerStatus::Loading => {
+                    ServerStatus::Loading => ui.spinner(),
-                        ui.spinner();
+                    ServerStatus::Connected => ui.label("Registered but no server peer chosen..."),
-                    }
+                    ServerStatus::NotConnected => ui.label("No connection.."),
-                    ServerStatus::Connected => {
+                    ServerStatus::ConnectedHandshake => ui.label("📡"),
-                        ui.label("Registered but no server peer chosen...");
+                };
-                    }
+
-                    ServerStatus::NotConnected => {
+                ui.add_space(8.0); // small gap
-                        ui.label("No connection..");
+
-                    }
+                // desired progress bar width
-                    ServerStatus::ConnectedHandshake => {
+                let bar_width = 220.0f32;
-                        let str = format!("📡");
+                // push it to the right by adding space equal to remaining width minus bar width
-                        ui.label(str);
+                let push = (ui.available_width() - bar_width).max(0.0);
-                    }
+                ui.add_space(push);
+
+                if let Some(total) = self.current_total_chunks {
+                    let received = self.current_received_chunks;
+                    let frac = if total == 0 {
+                        1.0
+                    } else {
+                        received as f32 / total as f32
+                    };
+
+                    ui.add(
+                        ProgressBar::new(frac)
+                            .show_percentage()
+                            .animate(true)
+                            .desired_height(10.0),
+                    );
                 }
-                ui.add_space(ui.available_width() - 30.0);
-                // formater mm:ss
-                let secs = self.remaining.as_secs();
-                let minutes = secs / 60;
-                let seconds = secs % 60;
-                ui.label(format!("{:02}:{:02}", minutes, seconds));
             });
         });
 
@@ -415,86 +490,225 @@ impl eframe::App for P2PClientApp {
                 });
 
                 ui.separator();
-                ScrollArea::vertical().show(ui, |ui| {
+                ScrollArea::vertical()
-                    if self.known_peers.is_empty() {
+                    .auto_shrink([false; 2])
-                        ui.add_space(10.0);
+                    .show(ui, |ui| {
-                        ui.label("No active peers.");
+                        ui.style_mut().visuals.widgets.inactive.bg_fill =
-                    } else {
+                            ui.style().visuals.widgets.inactive.bg_fill; // no-op to get mutable borrow
-                        for peer in &self.known_peers {
+                        if self.known_peers.is_empty() {
-                            let is_active =
+                            ui.add_space(10.0);
-                                self.active_peer.as_ref().map_or(false, |id| id == &peer.0); // if peer.id == self.active_peer_id
+                            ui.label("No active peers.");
+                        } else {
+                            for peer in &self.known_peers {
+                                let is_active =
+                                    self.active_peer.as_ref().map_or(false, |id| id == &peer.0); // if peer.id == self.active_peer_id
 
-                            let selectable;
+                                let selectable: Response;
-                            if &self.active_server == &peer.0 {
+                                // if &self.active_server == &peer.0 {
-                                selectable =
+                                //     // Create a frame with green background and render the selectable inside it.
-                                    ui.selectable_label(is_active, format!("{} 📡 🌀", peer.0))
+                                //     // Adjust rounding, padding and stroke as desired.
-                            } else {
+                                //     let frame = Frame {
-                                selectable = ui.selectable_label(is_active, format!("{}", peer.0));
+                                //         fill: Color32::DARK_BLUE,
-                            }
+                                //         stroke: Stroke::default(),
-                            if selectable.clicked() {
+                                //         corner_radius: CornerRadius::from(0.5),
-                                // switch to displaying this peer's tree
+                                //         ..Default::default()
-                                self.active_peer = Some(peer.0.clone());
+                                //     };
-                                // Request root content if not loaded
+                                //     let internal = frame.show(ui, |ui| {
-                                if !self
+                                //         // horizontal row: label on the left, spinner on the right
-                                    .loaded_fs
+                                //         ui.horizontal(|ui| {
-                                    .contains_key(self.active_peer.as_ref().unwrap())
+                                //             // let selectable label take remaining space
-                                {
+                                //             ui.with_layout(Layout::left_to_right(Align::Center), |ui| {
-                                    //todo!();
+                                //                 ui.add_space(0.0); // ensure layout established
-                                    let _ = self.network_cmd_tx.send(NetworkCommand::Discover(
+                                //                 return ui.selectable_label(
-                                        peer.0.clone(),
+                                //                     is_active,
-                                        "root".to_string(),
+                                //                     format!("{}", peer.0),
-                                        self.connected_address.clone(),
+                                //                 );
-                                    ));
+                                //             })
-                                }
+                                //             .inner // return Response from the inner closure if your egui version does so
-                            }
+                                //         })
-                            selectable.context_menu(|ui| {
+                                //     });
-                                // ... action
+                                //     selectable = internal.inner.inner;
-                                match self.server_status {
+                                // } else {
-                                    ServerStatus::Connected => {
+                                //     selectable = ui.selectable_label(is_active, format!("{}", peer.0));
-                                        if ui
+                                // }
-                                            .button("Utiliser le peer en tant que serveur")
+
-                                            .clicked()
+                                // place spinner to the right of the label
+                                ui.horizontal(|ui| {
+                                    // Use same width for the label widget as the selectable we already created:
+                                    // Recreate selectable inline so both label and spinner share the same row.
+                                    let resp = if &self.active_server == &peer.0 {
+                                        // draw with frame inline
+                                        let frame = Frame {
+                                            fill: Color32::DARK_BLUE,
+                                            stroke: Stroke::default(),
+                                            corner_radius: CornerRadius::from(0.5),
+                                            ..Default::default()
+                                        };
+                                        frame
+                                            .show(ui, |ui| {
+                                                ui.selectable_label(
+                                                    is_active,
+                                                    format!("{}", peer.0),
+                                                )
+                                            })
+                                            .inner
+                                    } else {
+                                        ui.selectable_label(is_active, format!("{}", peer.0))
+                                    };
+
+                                    ui.add_space(4.0); // small gap
+
+                                    if self.loading_peers.contains(&peer.0) {
+                                        // push spinner to right by expanding a spacer before it
+                                        ui.with_layout(
+                                            Layout::right_to_left(Align::Center),
+                                            |ui| {
+                                                ui.spinner();
+                                            },
+                                        );
+                                    }
+
+                                    // use resp (click handling etc.)
+                                    if resp.clicked() {
+                                        // switch to displaying this peer's tree
+                                        self.active_peer = Some(peer.0.clone());
+                                        // Request root content if not loaded
+                                        if !self
+                                            .loaded_fs
+                                            .contains_key(self.active_peer.as_ref().unwrap())
                                         {
-                                            self.active_server = peer.0.to_string();
+                                            //todo!();
-                                            let res = self.network_cmd_tx.send(
+                                            let _ =
-                                                NetworkCommand::ServerHandshake(
+                                                self.network_cmd_tx.send(NetworkCommand::Discover(
-                                                    peer.0.to_string(),
+                                                    peer.0.clone(),
+                                                    "root".to_string(),
                                                     self.connected_address.clone(),
-                                                ),
+                                                ));
-                                            );
                                         }
                                     }
-                                    _ => {}
+                                    resp.context_menu(|ui| {
-                                }
+                                    // ... action
-                                if ui.button("Send Ping").clicked() {
+                                    match self.server_status {
-                                    let res = self.network_cmd_tx.send(NetworkCommand::Ping(
+                                        ServerStatus::Connected => {
-                                        peer.0.to_string(),
+                                            if ui
-                                        self.connected_address.clone(),
+                                                .button("Utiliser le peer en tant que serveur")
-                                    ));
+                                                .clicked()
-                                }
+                                            {
-                                if ui.button("Send Nat Traversal Request").clicked() {
+                                                self.active_server = peer.0.to_string();
-                                    match self.network_cmd_tx.send(NetworkCommand::NatTraversal(
+                                                let res = self.network_cmd_tx.send(
-                                        peer.0.to_string(),
+                                                    NetworkCommand::ServerHandshake(
-                                        self.connected_address.clone(),
+                                                        peer.0.to_string(),
-                                    )) {
+                                                        self.connected_address.clone(),
-                                        Ok(_) => {
+                                                    ),
-                                            print!("[+] successfully sent nat traversal request")
+                                                );
-                                        }
+                                            }
-                                        Err(_) => {
-                                            print!("[-] failed to send nat traversal request")
                                         }
+                                        _ => {}
                                     }
-                                }
+                                    if ui.button("Send Ping").clicked() {
-                                if ui.button("Infos").clicked() {
+                                        let res = self.network_cmd_tx.send(NetworkCommand::Ping(
-                                    // action 3
+                                            peer.0.to_string(),
-                                    ui.close();
+                                            self.connected_address.clone(),
-                                }
+                                        ));
 
-                                // ... autres boutons
+                                        self.loading_peers.push(peer.0.to_owned());
-                            });
+                                    }
+                                    if ui.button("Send Nat Traversal Request").clicked() {
+                                        match self.network_cmd_tx.send(
+                                            NetworkCommand::NatTraversal(
+                                                peer.0.to_string(),
+                                                self.connected_address.clone(),
+                                            ),
+                                        ) {
+                                            Ok(_) => {
+                                                print!(
+                                                    "[+] successfully sent nat traversal request"
+                                                )
+                                            }
+                                            Err(_) => {
+                                                print!("[-] failed to send nat traversal request")
+                                            }
+                                        }
+                                    }
+                                    if ui.button("Infos").clicked() {
+                                        // action 3
+                                        ui.close();
+                                    }
+
+                                    // ... autres boutons
+                                });
+                                });
+
+                                // if self.loading_peers.contains(&peer.0) {
+                                //     ui.spinner();
+                                // }
+
+                                //if selectable.clicked() {
+                                // switch to displaying this peer's tree
+                                //self.active_peer = Some(peer.0.clone());
+                                //// Request root content if not loaded
+                                //if !self
+                                //    .loaded_fs
+                                //    .contains_key(self.active_peer.as_ref().unwrap())
+                                //{
+                                //    //todo!();
+                                //    let _ = self.network_cmd_tx.send(NetworkCommand::Discover(
+                                //        peer.0.clone(),
+                                //        "root".to_string(),
+                                //        self.connected_address.clone(),
+                                //    ));
+                                //}
+                                //}
+                                //selectable.context_menu(|ui| {
+                                //    // ... action
+                                //    match self.server_status {
+                                //        ServerStatus::Connected => {
+                                //            if ui
+                                //                .button("Utiliser le peer en tant que serveur")
+                                //                .clicked()
+                                //            {
+                                //                self.active_server = peer.0.to_string();
+                                //                let res = self.network_cmd_tx.send(
+                                //                    NetworkCommand::ServerHandshake(
+                                //                        peer.0.to_string(),
+                                //                        self.connected_address.clone(),
+                                //                    ),
+                                //                );
+                                //            }
+                                //        }
+                                //        _ => {}
+                                //    }
+                                //    if ui.button("Send Ping").clicked() {
+                                //        let res = self.network_cmd_tx.send(NetworkCommand::Ping(
+                                //            peer.0.to_string(),
+                                //            self.connected_address.clone(),
+                                //        ));
+
+                                //        self.loading_peers.push(peer.0.to_owned());
+                                //    }
+                                //    if ui.button("Send Nat Traversal Request").clicked() {
+                                //        match self.network_cmd_tx.send(NetworkCommand::NatTraversal(
+                                //            peer.0.to_string(),
+                                //            self.connected_address.clone(),
+                                //        )) {
+                                //            Ok(_) => {
+                                //                print!("[+] successfully sent nat traversal request")
+                                //            }
+                                //            Err(_) => {
+                                //                print!("[-] failed to send nat traversal request")
+                                //            }
+                                //        }
+                                //    }
+                                //    if ui.button("Infos").clicked() {
+                                //        // action 3
+                                //        ui.close();
+                                //    }
+
+                                //    // ... autres boutons
+                                //});
+                            }
                         }
-                    }
+                    });
-                });
             });
 
         CentralPanel::default().show(ctx, |ui| {
@@ -508,13 +722,17 @@ impl eframe::App for P2PClientApp {
             ui.separator();
 
             if let Some(active_peer) = &self.active_peer {
-                if let Some(tree) = self.loaded_fs.get(active_peer) {
+                if let Some(tree) = self.loaded_fs.clone().get(active_peer) {
                     ScrollArea::vertical().show(ui, |ui| {
                         // Start drawing the tree from the root hash
                         self.draw_file_tree(ui, tree);
                     });
                 } else {
-                    ui.label(format!("Loading root for peer: {}", active_peer));
+                    ui.horizontal(|ui| {
+                        ui.label(format!("Loading root for peer: {}", active_peer));
+                        ui.add_space(8.0);
+                        ui.spinner(); // or conditional: if is_loading { ui.spinner(); }
+                    });
                 }
             } else {
                 ui.label("Connect to a peer to view a file tree.");
@@ -533,13 +751,29 @@ impl eframe::App for P2PClientApp {
                 .resizable(false)
                 .anchor(egui::Align2::CENTER_CENTER, [0.0, 0.0])
                 .show(ctx, |ui| {
-                    ui.label(&msg);
+                    ui.label(&msg.1);
+                    ui.label(&msg.0);
                     if ui.button("OK").clicked() {
                         self.clear_error();
                     }
                 });
             ctx.request_repaint();
         }
+        if let Some(msg) = &self.success_message {
+            let msg = msg.clone();
+            egui::Window::new("Success")
+                .collapsible(false)
+                .resizable(false)
+                .anchor(egui::Align2::CENTER_CENTER, [0.0, 0.0])
+                .show(ctx, |ui| {
+                    ui.label(&msg.1);
+                    ui.label(&msg.0);
+                    if ui.button("OK").clicked() {
+                        self.clear_success();
+                    }
+                });
+            ctx.request_repaint();
+        }
 
         ctx.request_repaint_after(std::time::Duration::from_millis(10));
     }
@@ -548,7 +782,7 @@ impl eframe::App for P2PClientApp {
 // --- Helper for Drawing the Recursive File Tree ---
 
 impl P2PClientApp {
-    fn draw_file_tree(&self, ui: &mut Ui, tree: &MerkleTree) {
+    fn draw_file_tree(&mut self, ui: &mut Ui, tree: &MerkleTree) {
         assert!(self.active_peer.is_some());
         assert!(
             self.loaded_fs
@@ -565,7 +799,7 @@ impl P2PClientApp {
     }
 
     fn draw_file_node(
-        &self,
+        &mut self,
         ui: &mut Ui,
         to_draw: NodeHash,
         tree: &MerkleTree,
@@ -639,10 +873,16 @@ impl P2PClientApp {
                         .on_hover_text("Click to request file chunks...")
                         .clicked()
                     {
-                        if let Some(addr) = &self.active_peer {
+                        if let Some(name) = filename {
-                            let _ = self
+                            if let Ok(nameb) = String::from_utf8(name.to_vec()) {
-                                .network_cmd_tx
+                                if let Some(addr) = &self.active_peer {
-                                .send(NetworkCommand::InitDownload(to_draw, addr.clone()));
+                                    let _ = self.network_cmd_tx.send(NetworkCommand::InitDownload(
+                                        to_draw,
+                                        addr.clone(),
+                                        nameb,
+                                    ));
+                                }
+                            }
                         }
                     }
                 }

client-network/src/data.rs

@@ -154,8 +154,8 @@ impl MerkleNode {
         match self {
             MerkleNode::Chunk(_) => 0,
             MerkleNode::Directory(_) => 1,
-            MerkleNode::Big(_) => 3,
+            MerkleNode::Big(_) => 2,
-            MerkleNode::BigDirectory(_) => 4,
+            MerkleNode::BigDirectory(_) => 3,
         }
     }
 

client-network/src/datum_parsing.rs

@@ -11,7 +11,7 @@ pub fn parse_received_datum(
     datum_length: usize,
 ) -> Option<([u8; 32], MerkleNode)> {
     let hash_name: [u8; 32] = recevied_datum[..32].try_into().expect("error");
-    let value = &recevied_datum[32..datum_length];
+    let value = &recevied_datum[32..recevied_datum.len()];
     let value_slice = value.to_vec();
     println!("valueslice: {:?}, {}", value_slice, value_slice.len());
     let datum_type = value_slice[0];
@@ -49,12 +49,22 @@ pub fn parse_received_datum(
             }
         }
         BIG => {
+            let mut bigdir_entries: Vec<NodeHash> = Vec::new();
+            let mut offset = 1 as usize;
+            for i in 0..((value_slice.len() - 1) / 32) as u8 {
+                offset = (1 + 32 * i as usize) as usize;
+                println!("offset:{}, i:{}", offset, i);
+                let hash = &value_slice[offset..offset + 32];
+
+                // envoyer un datum request
+                bigdir_entries.push(hash.try_into().expect("incorrect size"));
+            }
+
             println!("its a BIG bro");
-            let chlidren: Vec<NodeHash> = Vec::new();
             Some((
                 hash_name,
                 MerkleNode::Big(crate::BigNode {
-                    children_hashes: chlidren,
+                    children_hashes: bigdir_entries,
                 }),
             ))
         }

client-network/src/fetchsocketaddresserror.rs

@@ -0,0 +1,26 @@
+use std::fmt;
+
+#[derive(Debug)]
+pub enum FetchSocketAddressError {
+    NoIPV4Address,
+    NoRegisteredAddresses,
+    NoResponseFromUser,
+    ClientError(String),
+}
+
+impl fmt::Display for FetchSocketAddressError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            FetchSocketAddressError::NoIPV4Address => write!(f, "No IPv4 Address registered."),
+            FetchSocketAddressError::NoRegisteredAddresses => {
+                write!(f, "No Registered Addresses found.")
+            }
+            FetchSocketAddressError::NoResponseFromUser => {
+                write!(f, "No Response from user after contact.")
+            }
+            FetchSocketAddressError::ClientError(error) => {
+                write!(f, "Client error : {}", error)
+            }
+        }
+    }
+}

client-network/src/lib.rs

@@ -2,6 +2,7 @@ mod cryptographic_signature;
 mod data;
 mod datum_generation;
 mod datum_parsing;
+mod fetchsocketaddresserror;
 mod message_handling;
 mod messages_channels;
 mod messages_structure;
@@ -9,9 +10,12 @@ mod peers_refresh;
 mod registration;
 mod server_communication;
 mod threads_handling;
+mod timestamp;
 
+use crate::fetchsocketaddresserror::FetchSocketAddressError;
 use crate::messages_structure::ROOTREPLY;
 use crate::peers_refresh::*;
+use crate::timestamp::Timestamp;
 use crate::{
     cryptographic_signature::CryptographicSignature,
     message_handling::EventType,
@@ -27,7 +31,6 @@ use crate::{
 };
 use std::collections::HashSet;
 use std::{
-    clone,
     io::Error,
     net::{IpAddr, Ipv4Addr, UdpSocket},
     time::Duration,
@@ -41,15 +44,17 @@ pub struct P2PSharedData {
     shared_socket: Arc<UdpSocket>,
     shared_cryptopair: Arc<CryptographicSignature>,
     shared_messageslist: Arc<Mutex<HashMap<i32, EventType>>>,
+    shared_messagesreceived: Arc<Mutex<HashMap<String, (EventType, Timestamp)>>>,
     shared_senders: Arc<MultipleSenders>,
     server_name: Arc<Mutex<String>>,
+    server_address: Arc<Mutex<String>>,
     handshake_peers: Arc<HandshakeHistory>,
     threads: Vec<Worker>,
 }
 
 use bytes::Bytes;
-use p256::pkcs8::der::pem::Base64Encoder;
 use reqwest::Client;
+use tokio::time::sleep;
 
 impl P2PSharedData {
     pub fn new(
@@ -57,26 +62,31 @@ impl P2PSharedData {
         cmd_tx: crossbeam_channel::Sender<NetworkEvent>,
     ) -> Result<P2PSharedData, Error> {
         let messages_list = HashMap::<i32, EventType>::new();
+        let messagesrecv_list = HashMap::<String, (EventType, Timestamp)>::new();
         let username = String::from(username);
         let crypto_pair = CryptographicSignature::new(username);
         let socket = UdpSocket::bind("0.0.0.0:0")?;
         let shared_socket = Arc::new(socket);
         let shared_cryptopair = Arc::new(crypto_pair);
         let shared_messageslist = Arc::new(Mutex::new(messages_list));
+        let shared_messagesreceived = Arc::new(Mutex::new(messagesrecv_list));
 
         let mut threads = Vec::new();
 
         let senders = MultipleSenders::new(1, &shared_socket, cmd_tx, &mut threads);
         let shared_senders = Arc::new(senders);
         let server_name = Arc::new(Mutex::new("".to_string()));
+        let server_address = Arc::new(Mutex::new("".to_string()));
         let handhsake_peers = Arc::new(HandshakeHistory::new());
 
         Ok(P2PSharedData {
             shared_socket: shared_socket,
             shared_cryptopair: shared_cryptopair,
             shared_messageslist: shared_messageslist,
+            shared_messagesreceived: shared_messagesreceived,
             shared_senders: shared_senders,
             server_name: server_name,
+            server_address: server_address,
             handshake_peers: handhsake_peers,
             threads,
         })
@@ -91,14 +101,31 @@ impl P2PSharedData {
     pub fn messages_list(&self) -> Arc<Mutex<HashMap<i32, EventType>>> {
         self.shared_messageslist.clone()
     }
+    pub fn messages_received(&self) -> Arc<Mutex<HashMap<String, (EventType, Timestamp)>>> {
+        self.shared_messagesreceived.clone()
+    }
     pub fn servername(&self) -> String {
-        let guard = self.server_name.lock().unwrap();
+        let guard = {
+            let maybe_sn = self.server_name.lock().unwrap();
+            maybe_sn.clone()
+        };
+        guard.to_string()
+    }
+    pub fn serveraddress(&self) -> String {
+        let guard = {
+            let maybe_sn = self.server_address.lock().unwrap();
+            maybe_sn.clone()
+        };
         guard.to_string()
     }
     pub fn set_servername(&self, new: String) {
         let mut guard = self.server_name.lock().unwrap();
         *guard = new
     }
+    pub fn set_serveraddress(&self, new: String) {
+        let mut guard = self.server_address.lock().unwrap();
+        *guard = new
+    }
     pub fn senders(&self) -> Arc<MultipleSenders> {
         self.shared_senders.clone()
     }
@@ -116,6 +143,10 @@ impl P2PSharedData {
         &*self.shared_messageslist
     }
 
+    pub fn messages_received_ref(&self) -> &Mutex<HashMap<String, (EventType, Timestamp)>> {
+        &*self.shared_messagesreceived
+    }
+
     pub fn senders_ref(&self) -> &MultipleSenders {
         &*self.shared_senders
     }
@@ -154,7 +185,7 @@ pub enum NetworkCommand {
     SendDatum(MerkleNode, [u8; 32], String),
     SendNoDatum(Vec<u8>, String),
     SendRootReply(Vec<u8>, String),
-    InitDownload([u8; 32], String),
+    InitDownload([u8; 32], String, String),
     // ...
 }
 
@@ -163,7 +194,8 @@ pub enum NetworkEvent {
     Connected(String),
     ConnectedHandshake(),
     Disconnected(),
-    Error(String),
+    Error(String, String),
+    Success(String, String),
     PeerConnected(String),
     PeerListUpdated(Vec<(String, bool)>),
     FileTreeReceived([u8; 32], MerkleNode, String), // peer_id, content
@@ -173,7 +205,7 @@ pub enum NetworkEvent {
     ServerHandshakeFailed(String),
     DatumRequest([u8; 32], String),
     RootRequest(String),
-    InitDownload([u8; 32], String),
+    InitDownload([u8; 32], String, String),
     // ...
 }
 
@@ -214,11 +246,14 @@ pub fn start_p2p_executor(
             // Check for commands from the GUI
             if let Ok(cmd) = cmd_rx.try_recv() {
                 match cmd {
-                    NetworkCommand::InitDownload(hash, ip) => {
+                    NetworkCommand::InitDownload(hash, ip, name) => {
                         if let Some(sd) = shared_data.as_ref() {
                             if let Some(res) = sd.handshake_peers.get_peer_info_username(ip) {
-                                let _ = event_tx
+                                let _ = event_tx.send(NetworkEvent::InitDownload(
-                                    .send(NetworkEvent::InitDownload(hash, res.ip.to_string()));
+                                    hash,
+                                    res.ip.to_string(),
+                                    name.to_string(),
+                                ));
                             }
                         }
                     }
@@ -305,9 +340,53 @@ pub fn start_p2p_executor(
                                 sd.messages_list(),
                                 sd.handshake_peers.get_username_peerinfo_map(),
                             );
+                            let server_address = {
+                                match get_server_address(username.to_owned(), ip.to_owned()).await {
+                                    Some(addr) => addr.to_string(),
+                                    None => {
+                                        match event_tx.send(NetworkEvent::Error(
+                                            "Couldn't fetch server socket address.".to_owned(),
+                                            username.to_owned(),
+                                        )) {
+                                            Ok(_) => {}
+                                            Err(e) => {
+                                                println!("Network Event Error : {}", e.to_string());
+                                            }
+                                        }
+                                        "".to_owned()
+                                    }
+                                }
+                            };
+                            if server_address.to_owned().eq(&"".to_owned()) {
+                                continue;
+                            }
 
-                            let res =
+                            sd.set_servername(username.to_owned());
-                                perform_handshake(&sd, username, ip, event_tx.clone(), true).await;
+                            sd.set_serveraddress(server_address.to_string());
+                            println!("SET SERVERADDRESS");
+
+                            match perform_handshake(
+                                &sd,
+                                username.to_owned(),
+                                ip,
+                                event_tx.clone(),
+                                (true, server_address.to_string()),
+                            )
+                            .await
+                            {
+                                true => {
+                                    match event_tx.send(NetworkEvent::Success(
+                                        "Handshake established ✔️".to_string(),
+                                        username.to_owned(),
+                                    )) {
+                                        Ok(_) => {}
+                                        Err(err) => {
+                                            println!("Network Event Error : {}", err.to_string());
+                                        }
+                                    };
+                                }
+                                false => {}
+                            };
                         } else {
                             println!("no shared data");
                         }
@@ -325,7 +404,9 @@ pub fn start_p2p_executor(
                     NetworkCommand::Discover(username, hash, ip) => {
                         // envoie un handshake au peer, puis un root request
                         if let Some(sd) = shared_data.as_ref() {
-                            let res = sd.handshake_peers.get_peer_info_username(username.clone());
+                            let res = sd
+                                .handshake_peers
+                                .get_peer_info_username(username.to_owned());
                             match res {
                                 Some(peerinfo) => {
                                     let id = generate_id();
@@ -360,14 +441,31 @@ pub fn start_p2p_executor(
                                 }
                                 None => {
                                     // envoyer un handshake
-                                    let res = perform_handshake(
+                                    match perform_handshake(
                                         &sd,
-                                        username,
+                                        username.to_owned(),
                                         ip,
                                         event_tx.clone(),
-                                        false,
+                                        (false, "".to_string()),
                                     )
-                                    .await;
+                                    .await
+                                    {
+                                        true => {
+                                            match event_tx.send(NetworkEvent::Success(
+                                                "Handshake established ✔️".to_string(),
+                                                username.to_owned(),
+                                            )) {
+                                                Ok(_) => {}
+                                                Err(err) => {
+                                                    println!(
+                                                        "Network Event Error : {}",
+                                                        err.to_string()
+                                                    );
+                                                }
+                                            };
+                                        }
+                                        false => {}
+                                    }
                                 }
                             }
                         } else {
@@ -426,7 +524,8 @@ pub fn start_p2p_executor(
                             Err(e) => {
                                 let mut err_msg = String::from("failed to initialize socket: ");
                                 err_msg += &e.to_string();
-                                let res = event_tx.send(NetworkEvent::Error(err_msg));
+                                let res =
+                                    event_tx.send(NetworkEvent::Error(err_msg, name.to_owned()));
                                 let res = event_tx.send(NetworkEvent::Disconnected());
                                 None
                             }
@@ -436,7 +535,8 @@ pub fn start_p2p_executor(
                             if let Err(e) = register_with_the_server(&sd.cryptopair(), &ip).await {
                                 let mut err_msg = String::from("request failed: ");
                                 err_msg += &e.to_string();
-                                let res = event_tx.send(NetworkEvent::Error(err_msg));
+                                let res =
+                                    event_tx.send(NetworkEvent::Error(err_msg, name.to_owned()));
                                 let res = event_tx.send(NetworkEvent::Disconnected());
                             } else {
                                 let res = event_tx.send(NetworkEvent::Connected(ip));
@@ -456,9 +556,11 @@ pub fn start_p2p_executor(
                         }*/
                     }
                     NetworkCommand::FetchPeerList(ip) => {
+                        println!("[Network] FetchPeerList() called");
                         if ip == "" {
                             let res = event_tx.send(NetworkEvent::Error(
                                 "Not registered to any server".to_string(),
+                                "".to_owned(),
                             ));
                         } else {
                             println!("cc");
@@ -485,48 +587,70 @@ pub fn start_p2p_executor(
                                 Err(e) => println!("error"),
                             }
                         }
-                        println!("[Network] FetchPeerList() called");
                     }
                     NetworkCommand::RegisterAsPeer(_) => {
                         println!("[Network] RegisterAsPeer() called");
                     }
                     NetworkCommand::Ping(str, ip) => {
+                        println!("[Network] Ping({}) called", str);
                         if let Some(sd) = shared_data.as_ref() {
                             let id = generate_id();
                             sd.add_message(id, EventType::Ping);
                             let pingrequest =
                                 construct_message(PING, Vec::new(), id, sd.cryptopair_ref());
-                            let peer_address = get_socket_address(str, ip).await;
+                            let peer_address =
+                                get_socket_address(str.to_owned(), ip, shared_data.as_ref()).await;
                             match peer_address {
-                                Some(addr) => {
+                                Ok(addr) => {
-                                    if let Some(ping) = pingrequest {
+                                    //if let Some(ping) = pingrequest {
-                                        sd.senders_ref().add_message_to_retry_queue(
+                                    //    sd.senders_ref().add_message_to_retry_queue(
-                                            ping.clone(),
+                                    //        ping.clone(),
+                                    //        addr.to_string(),
+                                    //        false,
+                                    //    );
+                                    //    sd.senders_ref().send_dispatch(
+                                    //        ping,
+                                    //        addr.to_string(),
+                                    //        false,
+                                    //        sd.messages_list(),
+                                    //    );
+                                    //}
+                                    match event_tx.send(NetworkEvent::Success(
+                                        format!(
+                                            "Successfully sent ping message to {}.",
                                             addr.to_string(),
-                                            false,
+                                        ),
-                                        );
+                                        str.to_owned(),
-                                        sd.senders_ref().send_dispatch(
+                                    )) {
-                                            ping,
+                                        Ok(_) => {}
-                                            addr.to_string(),
+                                        Err(e) => {
-                                            false,
+                                            eprintln!("NetworkEvent error : {}", e);
-                                            sd.messages_list(),
+                                        }
-                                        );
+                                    };
-                                    }
                                 }
-                                None => {
+                                Err(err_msg) => {
-                                    let err_msg =
+                                    match event_tx
-                                        format!("failed to retreive socket address:").to_string();
+                                        .send(NetworkEvent::Error(err_msg.to_string(), str))
-                                    let res = event_tx.send(NetworkEvent::Error(err_msg));
+                                    {
+                                        Ok(_) => {}
+                                        Err(e) => {
+                                            eprintln!("NetworkEvent error : {}", e);
+                                        }
+                                    }
                                 }
                             }
                         }
-                        println!("[Network] Ping() called");
                     }
                     NetworkCommand::Disconnect() => {
                         if let Some(sd) = shared_data.as_ref() {
                             println!("Disconnecting: {}", &sd.cryptopair().username);
                             shared_data = None;
-                            let res = event_tx.send(NetworkEvent::Disconnected());
+                            match event_tx.send(NetworkEvent::Disconnected()) {
+                                Ok(_) => {}
+                                Err(e) => {
+                                    eprintln!("NetworkEvent error : {}", e);
+                                }
+                            }
                         } else {
                             println!("no p2p data");
                         }
@@ -542,45 +666,46 @@ pub fn start_p2p_executor(
                         if let Some(sd) = shared_data.as_ref() {
                             println!("username:{}, ip:{}", username, ip);
                             // user server to send nattraversal request
-                            let server_addr_query =
+                            let server_addr = sd.serveraddress();
-                                get_socket_address(sd.servername().clone(), ip.clone());
+                            let peer_addr_query = get_socket_address(
-                            let peer_addr_query = get_socket_address(username.clone(), ip.clone());
+                                username.clone(),
+                                ip.clone(),
+                                shared_data.as_ref(),
+                            );
 
-                            match server_addr_query.await {
+                            match peer_addr_query.await {
-                                Some(server_addr) => match peer_addr_query.await {
+                                Ok(peer_addr) => {
-                                    Some(peer_addr) => {
+                                    let payload = socket_addr_to_vec(peer_addr);
-                                        let payload = socket_addr_to_vec(server_addr);
 
-                                        print!("{:?}", payload.clone());
+                                    print!("{:?}", payload.clone());
 
-                                        let id = generate_id();
+                                    let id = generate_id();
-                                        let natreq = construct_message(
+                                    let natreq = construct_message(
-                                            NATTRAVERSALREQUEST,
+                                        NATTRAVERSALREQUEST,
-                                            payload.clone(),
+                                        payload.clone(),
-                                            id.clone(),
+                                        id.clone(),
-                                            &sd.cryptopair(),
+                                        &sd.cryptopair(),
-                                        );
+                                    );
 
-                                        sd.add_message(id, EventType::NatTraversal);
+                                    sd.add_message(id, EventType::NatTraversal);
-                                        sd.senders_ref().send_dispatch(
+                                    sd.senders_ref().send_dispatch(
-                                            natreq.expect(
+                                        natreq.expect(
-                                                "couldnt construct message nattraversalrequest2",
+                                            "couldnt construct message nattraversalrequest2",
-                                            ),
+                                        ),
-                                            server_addr.to_string(),
+                                        server_addr.to_string(),
-                                            false,
+                                        false,
-                                            sd.messages_list(),
+                                        sd.messages_list(),
-                                        );
+                                    );
+                                }
+                                Err(err_msg) => {
+                                    match event_tx
+                                        .send(NetworkEvent::Error(err_msg.to_string(), username))
+                                    {
+                                        Ok(_) => {}
+                                        Err(e) => {
+                                            eprintln!("NetworkEvent error : {}", e);
+                                        }
                                     }
-                                    None => {
-                                        let err_msg = format!("failed to retreive socket address")
-                                            .to_string();
-                                        let res = event_tx.send(NetworkEvent::Error(err_msg));
-                                    }
-                                },
-                                None => {
-                                    let err_msg =
-                                        format!("failed to retreive socket address").to_string();
-                                    let res = event_tx.send(NetworkEvent::Error(err_msg));
                                 }
                             }
                         }
@@ -594,7 +719,7 @@ pub fn start_p2p_executor(
             // event_tx.send(NetworkEvent::PeerConnected("NewPeerID".to_string())).unwrap();
 
             // Avoid spinning too fast
-            tokio::time::sleep(std::time::Duration::from_millis(50)).await;
+            sleep(std::time::Duration::from_millis(50)).await;
         }
     })
 }
@@ -624,11 +749,135 @@ fn parse_pack(s: &str) -> Option<[u8; 6]> {
     ])
 }
 
+async fn quick_ping(addr: &SocketAddr, timeout_ms: u64, sd: &P2PSharedData) -> bool {
+    let id = generate_id();
+    let pingreq = construct_message(PING, Vec::new(), id, &sd.shared_cryptopair);
+
+    if let Some(ping) = pingreq {
+        sd.add_message(id, EventType::Ping);
+        sd.senders_ref()
+            .send_dispatch(ping, addr.to_string(), false, sd.messages_list());
+    }
+
+    sleep(Duration::from_millis(timeout_ms)).await;
+
+    let msg_list = sd.messages_list_ref().lock().expect("yooo");
+    let res = !msg_list.contains_key(&id);
+
+    for (id, evt) in msg_list.iter() {
+        println!("id : {}, evt : {}", id, evt.to_string());
+    }
+    println!("message list doesnt contain key? {}", res);
+
+    res
+}
+
 ///
 /// sends a get request to the server to get the socket address of the given peer
 ///
 
-pub async fn get_socket_address(username: String, ip: String) -> Option<SocketAddr> {
+pub async fn get_socket_address(
+    username: String,
+    ip: String,
+    shared_data: Option<&P2PSharedData>,
+) -> Result<SocketAddr, FetchSocketAddressError> {
+    let sd = shared_data.expect("No shared data");
+
+    let client = match Client::builder().timeout(Duration::from_secs(5)).build() {
+        Ok(c) => c,
+        Err(e) => {
+            return Err(FetchSocketAddressError::ClientError(e.to_string()));
+        }
+    };
+
+    let uri = format!("{}/peers/{}/addresses", ip, username);
+    let res = match client.get(&uri).send().await {
+        Ok(r) => r,
+        Err(e) => return Err(FetchSocketAddressError::ClientError(e.to_string())),
+    };
+
+    if res.status().is_success() {
+        println!("Successfully retrieved the addresses. {}", res.status());
+    } else {
+        eprintln!(
+            "Failed to get the peers addresses from the server. Status: {}",
+            res.status()
+        );
+    }
+
+    let body = match res.bytes().await {
+        Ok(b) => b,
+        Err(e) => {
+            return Err(FetchSocketAddressError::ClientError(e.to_string()));
+        }
+    };
+
+    let s = match String::from_utf8(body.to_vec()) {
+        Ok(st) => st,
+        Err(e) => {
+            return Err(FetchSocketAddressError::ClientError(e.to_string()));
+        }
+    };
+
+    let addresses: Vec<SocketAddr> = {
+        let temp = parse_addresses(&s);
+        temp.iter()
+            .filter_map(|a| match a {
+                SocketAddr::V4(_) => Some(*a),
+                SocketAddr::V6(_) => None,
+            })
+            .collect()
+    };
+
+    if addresses.is_empty() {
+        return Err(FetchSocketAddressError::NoRegisteredAddresses);
+    } else if !addresses.iter().any(|a| matches!(a, SocketAddr::V4(_))) {
+        return Err(FetchSocketAddressError::NoIPV4Address);
+    }
+
+    for addr in addresses {
+        println!("trying address : {}", addr);
+        if quick_ping(&addr, 5000, sd).await {
+            return Ok(addr);
+        }
+
+        let payload = socket_addr_to_vec(addr);
+        let id = generate_id();
+
+        let natreq = construct_message(NATTRAVERSALREQUEST, payload.clone(), id, &sd.cryptopair());
+
+        sd.add_message(id, EventType::NatTraversal);
+        sd.senders_ref().send_dispatch(
+            natreq.expect("couldnt construct message nattraversalrequest2"),
+            sd.serveraddress().to_string(),
+            false,
+            sd.messages_list(),
+        );
+
+        sleep(Duration::from_millis(5000)).await;
+
+        let maybe_entry = {
+            let guard = sd.messages_received_ref().lock().unwrap();
+            guard.clone()
+        }; // guard dropped
+
+        for (id, (evt, time)) in maybe_entry.iter() {
+            println!("{} : {} at {}", id, evt.to_string(), time.to_string());
+            if id.eq(&addr.to_string()) && Timestamp::now().diff(time) < 10 {
+                println!("received message from address, returning said address..");
+                return Ok(addr);
+            }
+        }
+
+        if quick_ping(&addr, 15000, sd).await {
+            return Ok(addr);
+        }
+    }
+
+    Err(FetchSocketAddressError::NoResponseFromUser)
+}
+
+pub async fn get_server_address(username: String, ip: String) -> Option<SocketAddr> {
     let client = Client::builder()
         .timeout(Duration::from_secs(5))
         .build()

client-network/src/message_handling.rs

@@ -1,17 +1,16 @@
 use crate::{
     NetworkEvent, NodeHash,
-    cryptographic_signature::{
+    cryptographic_signature::{CryptographicSignature, get_peer_key, verify_signature},
-        CryptographicSignature, get_peer_key, sign_message, verify_signature,
-    },
     datum_parsing::parse_received_datum,
     messages_channels::MultipleSenders,
     messages_structure::construct_message,
     peers_refresh::HandshakeHistory,
-    registration,
     server_communication::generate_id,
+    timestamp::Timestamp,
 };
 use std::{
     collections::HashMap,
+    default,
     net::{Ipv4Addr, SocketAddr},
 };
 use std::{
@@ -20,7 +19,7 @@ use std::{
 };
 
 // Types of messages that await for a response
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub enum EventType {
     HelloThenRootRequest,
     Hello,
@@ -29,6 +28,33 @@ pub enum EventType {
     NatTraversal,
     DatumRequest,
     DatumRequestBig,
+    Unknown,
+}
+
+impl EventType {
+    pub fn to_string(&self) -> String {
+        match self {
+            EventType::HelloThenRootRequest => "HelloThenRootRequest".to_owned(),
+            EventType::Hello => "Hello".to_owned(),
+            EventType::RootRequest => "RootRequest".to_owned(),
+            EventType::Ping => "Ping".to_owned(),
+            EventType::NatTraversal => "NatTraversal".to_owned(),
+            EventType::DatumRequest => "DatumRequest".to_owned(),
+            EventType::Unknown => "Unknown".to_owned(),
+            EventType::DatumRequestBig => "DatumRequestBig".to_owned(),
+        }
+    }
+
+    pub fn from_msgtype(msgtype: u8) -> EventType {
+        match msgtype {
+            PING => EventType::Ping,
+            HELLO => EventType::Hello,
+            ROOTREQUEST => EventType::RootRequest,
+            NATTRAVERSALREQUEST => EventType::NatTraversal,
+            DATUMREQUEST => EventType::DatumRequest,
+            _ => EventType::Unknown,
+        }
+    }
 }
 
 const ID: usize = 4;
@@ -52,6 +78,7 @@ const NATTRAVERSALREQUEST2: u8 = 5;
 
 pub fn handle_recevied_message(
     messages_list: &Arc<Mutex<HashMap<i32, EventType>>>,
+    messages_received: &Arc<Mutex<HashMap<String, (EventType, Timestamp)>>>,
     recevied_message: &Vec<u8>,
     crypto_pair: &CryptographicSignature,
     //socket_addr: &SocketAddr,
@@ -90,6 +117,7 @@ pub fn handle_recevied_message(
         cmd_tx,
         ip,
         messages_list,
+        messages_received,
         handhsake_history,
         senders,
     );
@@ -115,6 +143,7 @@ pub fn parse_message(
     cmd_tx: crossbeam_channel::Sender<NetworkEvent>,
     ip: SocketAddr,
     messages_list: &Arc<Mutex<HashMap<i32, EventType>>>,
+    messages_received: &Arc<Mutex<HashMap<String, (EventType, Timestamp)>>>,
     handhsake_history: Arc<HandshakeHistory>,
     senders: &MultipleSenders,
 ) -> Option<Vec<u8>> {
@@ -126,6 +155,14 @@ pub fn parse_message(
 
     let msgtype = received_message[ID];
 
+    messages_received
+        .lock()
+        .expect("couldnt lock received map")
+        .insert(
+            ip.to_string(),
+            (EventType::from_msgtype(msgtype), Timestamp::now()),
+        );
+
     let length_bytes: [u8; 2] = received_message[TYPE..LENGTH]
         .try_into()
         .expect("Taille incorrecte");
@@ -280,10 +317,10 @@ pub fn parse_message(
                 String::from_utf8(received_message[LENGTH..(msg_length + LENGTH)].to_vec())
             {
                 let err_msg = format!("Error received from peer {} : {}", ip, err_received);
-                let _ = cmd_tx_clone.send(NetworkEvent::Error(err_msg));
+                let _ = cmd_tx_clone.send(NetworkEvent::Error(err_msg, "".to_owned()));
             } else {
                 let err_msg = format!("Error received from peer {} : N/A", ip,);
-                let _ = cmd_tx_clone.send(NetworkEvent::Error(err_msg));
+                let _ = cmd_tx_clone.send(NetworkEvent::Error(err_msg, "".to_owned()));
             }
         }
 
@@ -438,6 +475,7 @@ pub fn parse_message(
                                 .try_into()
                                 .expect("incorrect size"),
                         );
+                        println!("received length:{}", received_length);
                         let received_datum = &received_message[LENGTH..];
                         let parsed_node =
                             parse_received_datum(received_datum.to_vec(), received_length as usize);

client-network/src/messages_channels.rs

@@ -1,8 +1,8 @@
 use crossbeam_channel::Receiver;
+use tokio::sync::oneshot;
 use tokio::time::sleep;
 
 use crate::P2PSharedData;
-use crate::cryptographic_signature::CryptographicSignature;
 use crate::message_handling::EventType;
 use crate::message_handling::handle_recevied_message;
 use crate::peers_refresh::HandshakeHistory;
@@ -193,6 +193,7 @@ pub fn start_retry_thread(
                 // on verifie si le message a recu une reponse
                 let message_id: [u8; 4] = front.msg.payload[0..4].try_into().expect("size error");
                 let id = i32::from_be_bytes(message_id);
+
                 let message_type = front.msg.payload[4];
                 let guard = messages_list.lock().unwrap();
 
@@ -268,6 +269,7 @@ pub fn start_receving_thread(
     let cryptopair_clone = shared_data.cryptopair();
     let senders_clone = shared_data.senders();
     let messages_clone = shared_data.messages_list();
+    let messages_received_clone = shared_data.messages_received();
     let servername_clone = shared_data.servername();
     let thread = thread::spawn(move || {
         let mut buf = [0u8; 1024];
@@ -279,6 +281,7 @@ pub fn start_receving_thread(
                     println!("Reçu {} octets de {}: {:?}", amt, src, received_data);
                     handle_recevied_message(
                         &messages_clone,
+                        &messages_received_clone,
                         &received_data,
                         &cryptopair_clone,
                         &senders_clone,

client-network/src/registration.rs

@@ -1,19 +1,15 @@
-use bytes::Bytes;
-
 use crate::NetworkEvent;
 use crate::P2PSharedData;
-use crate::cryptographic_signature::{CryptographicSignature, formatPubKey, sign_message};
+use crate::cryptographic_signature::CryptographicSignature;
+use crate::get_server_address;
 use crate::get_socket_address;
 use crate::message_handling::EventType;
-use crate::messages_channels::MultipleSenders;
 use crate::messages_structure::construct_message;
 use crate::server_communication::generate_id;
-use crossbeam_channel::{Receiver, Sender};
+use crossbeam_channel::Sender;
-use std::collections::HashMap;
 use std::net::SocketAddr;
-use std::net::UdpSocket;
 use std::str::FromStr;
-use std::sync::{Arc, Mutex};
+use std::sync::Arc;
 
 ///
 /// sends the cryptographic signature to the server using a PUT request over the HTTP API.
@@ -29,8 +25,13 @@ pub async fn register_with_the_server(
     let pubkey_bytes_minus = pubkey_bytes[1..].to_vec();
     let res = client.put(uri).body(pubkey_bytes_minus).send().await?;
     let res = res.error_for_status()?;
-    println!("register ip adresses");
+    match res.error_for_status() {
-    Ok(())
+        Ok(_) => {
+            println!("register ip adresses");
+            Ok(())
+        }
+        Err(e) => Err(e),
+    }
 }
 
 pub fn parse_addresses(input: &String) -> Vec<SocketAddr> {
@@ -55,46 +56,71 @@ pub async fn perform_handshake(
     username: String,
     ip: String,
     event_tx: Sender<NetworkEvent>,
-    is_server_handshake: bool,
+    is_server_handshake: (bool, String),
-) {
+) -> bool {
     println!("username: {}, ip: {}", username.clone(), ip.clone());
     let crypto_pair = sd.cryptopair_ref();
     let senders = sd.senders_ref();
 
     let id = generate_id();
-    let server_addr_query = get_socket_address(username.clone(), ip.clone());
-    match server_addr_query.await {
-        Some(sockaddr_bytes) => {
-            sd.set_servername(username);
-            // first: &SocketAddr
-            let mut payload = Vec::new();
-            payload.extend_from_slice(&0u32.to_be_bytes());
-            payload.extend_from_slice(&crypto_pair.username.clone().as_bytes());
-            let hello_handshake = construct_message(1, payload, id, crypto_pair);
-            if is_server_handshake {
-                sd.add_message(id, EventType::Hello);
-            } else {
-                sd.add_message(id, EventType::HelloThenRootRequest);
-            }
 
-            match hello_handshake {
+    let address = {
-                Some(handshake_message) => {
+        if is_server_handshake.0 {
-                    senders.send_dispatch(
+            is_server_handshake.1
-                        handshake_message,
+        } else {
-                        sockaddr_bytes.to_string(),
+            let server_addr_query =
-                        is_server_handshake,
+                get_socket_address(username.clone(), ip.clone(), Some(sd)).await;
-                        sd.messages_list(),
+
-                    );
+            match server_addr_query {
+                Ok(sockaddr_bytes) => sockaddr_bytes.to_string(),
+                Err(err_msg) => {
+                    match event_tx.send(NetworkEvent::Error(
+                        err_msg.to_string(),
+                        username.to_owned(),
+                    )) {
+                        Ok(_) => {}
+                        Err(err) => {
+                            println!("Network Event Error : {}", err.to_string());
+                        }
+                    }
+                    "".to_string()
                 }
-                None => {}
             }
         }
-        None => {
+    };
-            let err_msg = format!("failed to retreive socket address:").to_string();
+
-            let res = event_tx.send(NetworkEvent::Error(err_msg));
+    if address.eq(&"".to_string()) {
-        }
+        return false;
     }
 
+    let mut payload = Vec::new();
+    payload.extend_from_slice(&0u32.to_be_bytes());
+    payload.extend_from_slice(&crypto_pair.username.clone().as_bytes());
+    let hello_handshake = construct_message(1, payload, id, crypto_pair);
+    if is_server_handshake.0 {
+        sd.add_message(id, EventType::Hello);
+    } else {
+        sd.add_message(id, EventType::HelloThenRootRequest);
+    }
+
+    match hello_handshake {
+        Some(handshake_message) => {
+            senders.send_dispatch(
+                handshake_message,
+                address,
+                is_server_handshake.0,
+                sd.messages_list(),
+            );
+        }
+        None => {}
+    }
+
+    //let server_addr_query = get_socket_address(username.clone(), ip.clone(), Some(sd)).await;
+    //match server_addr_query {
+    //    Ok(sockaddr_bytes) => {}
+    //    Err(err_msg) => {}
+    //}
+
     /*let mut list = messages_list.lock().expect("Failed to lock messages_list");
     match list.get(&id) {
         Some(_) => {
@@ -111,12 +137,11 @@ pub async fn perform_handshake(
     let hello_handshake_received = UDPMessage::parse(buf.to_vec());
     hello_handshake_received.display();*/
     //TODO
+    return true;
 }
 
 #[cfg(test)]
 mod tests {
-    // Note this useful idiom: importing names from outer (for mod tests) scope.
-    use super::*;
 
     /*///
     /// does the procedure to register with the server

client-network/src/timestamp.rs

@@ -0,0 +1,46 @@
+use std::time::{SystemTime, UNIX_EPOCH};
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct Timestamp {
+    secs: u64, // seconds since UNIX epoch
+}
+
+unsafe impl Send for Timestamp {}
+
+impl Timestamp {
+    // Create a Timestamp from current system time
+    pub fn now() -> Self {
+        let dur = SystemTime::now()
+            .duration_since(UNIX_EPOCH)
+            .expect("system time before UNIX_EPOCH");
+        Self {
+            secs: dur.as_secs(),
+        }
+    }
+
+    // Create from explicit fields (optional helper)
+    pub fn from_secs(secs: u64) -> Self {
+        Self { secs }
+    }
+
+    // Return underlying seconds
+    pub fn as_secs(&self) -> u64 {
+        self.secs
+    }
+
+    // Return elapsed seconds between `self` and `other`.
+    // Panics if `other` is in the future relative to `self`.
+    // If you call `Timestamp::now().diff(past)`, it returns seconds since `past`.
+    pub fn diff(&self, earlier: &Timestamp) -> u64 {
+        assert!(earlier.secs <= self.secs, "given time is in the future");
+        self.secs - earlier.secs
+    }
+
+    pub fn to_string(&self) -> String {
+        let secs_of_day = self.secs % 86_400;
+        let hh = secs_of_day / 3600;
+        let mm = (secs_of_day % 3600) / 60;
+        let ss = secs_of_day % 60;
+        format!("{:02}:{:02}:{:02}", hh, mm, ss)
+    }
+}