working

.gitignore

@@ -1 +1,2 @@
-/target
+/target
+target/

client-gui/src/gui_app.rs

@@ -1,13 +1,17 @@
 use client_network::{
-    ChunkNode, MerkleNode, MerkleTree, NetworkCommand, NetworkEvent, NodeHash, filename_to_string,
+    ChunkNode, MerkleNode, MerkleTree, NetworkCommand, NetworkEvent, NodeHash,
-    node_hash_to_hex_string,
+    big_or_chunk_to_file, filename_to_string, generate_base_tree, node_hash_to_hex_string,
+    remove_null_bytes,
 };
 use crossbeam_channel::{Receiver, Sender};
 use egui::{
-    Align, Align2, Button, CentralPanel, CollapsingHeader, Context, Id, LayerId, Layout, Order,
+    CentralPanel, CollapsingHeader, Color32, Context, CornerRadius, Frame, Response, ScrollArea,
-    Popup, ScrollArea, SidePanel, TextStyle, TopBottomPanel, Ui, ViewportCommand,
+    SidePanel, Stroke, TopBottomPanel, Ui, ViewportCommand,
 };
-use std::{collections::HashMap, fmt::format};
+use std::collections::HashSet;
+use std::{collections::HashMap, fmt::format, io::Seek};
+
+use std::fs::{File, OpenOptions, create_dir};
 
 enum ServerStatus {
     Loading,
@@ -34,6 +38,7 @@ pub struct P2PClientApp {
 
     // Key: Parent Directory Hash (String), Value: List of children FileNode
     loaded_fs: HashMap<String, MerkleTree>,
+    shared_tree: MerkleTree,
 
     // Current peer tree displayed
     active_peer: Option<String>,
@@ -43,8 +48,12 @@ pub struct P2PClientApp {
     show_network_popup: bool, // gérer selon besoin
 
     error_message: Option<String>, // Some(message) -> afficher, None -> rien
-    //
+    success_message: Option<String>, // Some(message) -> afficher, None -> rien
     active_server: String,
+
+    current_downloading_file_map: MerkleTree,
+    remaining_chunks: HashSet<[u8; 32]>,
+    root_downloading_file: String,
 }
 
 impl P2PClientApp {
@@ -52,6 +61,7 @@ impl P2PClientApp {
         //let (root_hash, tree_content) = MerkleNode::generate_base_tree();
 
         let mut loaded_fs = HashMap::new();
+        let mut current_downloading_file_map = MerkleTree::new(HashMap::new(), [0; 32]);
         //let tree = MerkleTree::new(tree_content, root_hash);
         //loaded_fs.insert("bob".to_string(), tree);
 
@@ -62,7 +72,7 @@ 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(),
             connect_address_input: "https://jch.irif.fr:8443".to_string(),
             connected_address: "".to_string(),
             loaded_fs,
@@ -70,16 +80,27 @@ 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,
+            root_downloading_file: "".to_string(),
+            remaining_chunks: HashSet::new(),
         }
     }
     pub fn show_error(&mut self, msg: impl Into<String>) {
         self.error_message = Some(msg.into());
     }
+    pub fn show_success(&mut self, msg: impl Into<String>) {
+        self.success_message = Some(msg.into());
+    }
     pub fn clear_error(&mut self) {
         self.error_message = None;
     }
+    pub fn clear_success(&mut self) {
+        self.success_message = None;
+    }
 }
 
 // --- eframe::App Trait Implementation ---
@@ -115,13 +136,70 @@ impl eframe::App for P2PClientApp {
                         self.known_peers.push((addr, true));
                     }
                 }
+                NetworkEvent::RootRequest(addr) => {
+                    let root = self.shared_tree.root;
+                    let _ = self
+                        .network_cmd_tx
+                        .send(NetworkCommand::SendRootReply(root.to_vec(), addr));
+                }
+                NetworkEvent::DatumRequest(node_hash, addr) => {
+                    let hash: NodeHash = node_hash.try_into().expect("incorrect size");
+                    let asked_datum = self.shared_tree.data.get(&hash);
+                    match asked_datum {
+                        Some(datum_found) => {
+                            let _ = self.network_cmd_tx.send(NetworkCommand::SendDatum(
+                                datum_found.clone(),
+                                node_hash,
+                                addr,
+                            ));
+                        }
+                        None => {
+                            let _ = self
+                                .network_cmd_tx
+                                .send(NetworkCommand::SendNoDatum(node_hash.to_vec(), addr));
+                        }
+                    }
+                }
                 NetworkEvent::PeerListUpdated(peers) => {
                     //todo!();
 
                     self.known_peers = peers;
                 }
-                NetworkEvent::FileTreeReceived(node_hash, merklenode) => {
+
-                    //self.status_message = "🔄 File tree updated successfully.".to_string();
+                NetworkEvent::FileTreeReceived(node_hash, merklenode, ip) => {
+                    match &self.active_peer {
+                        Some(active_peer) => {
+                            if let Some(maptree) = self.loaded_fs.get_mut(active_peer) {
+                                maptree.data.insert(node_hash, merklenode.clone());
+                                match merklenode {
+                                    MerkleNode::Directory(d) => {
+                                        for entry in d.entries {
+                                            let _ = self.network_cmd_tx.send(
+                                                NetworkCommand::GetChildren(
+                                                    entry.content_hash,
+                                                    ip.clone(),
+                                                    false,
+                                                ),
+                                            );
+                                        }
+                                    }
+                                    MerkleNode::BigDirectory(bigd) => {
+                                        for entry in bigd.children_hashes {
+                                            let _ = self.network_cmd_tx.send(
+                                                NetworkCommand::GetChildren(
+                                                    entry,
+                                                    ip.clone(),
+                                                    false,
+                                                ),
+                                            );
+                                        }
+                                    }
+                                    _ => {}
+                                }
+                            }
+                        }
+                        None => {}
+                    }
                 }
                 NetworkEvent::FileTreeRootReceived(peer_id, root_hash) => {
                     // todo!();
@@ -133,8 +211,10 @@ impl eframe::App for P2PClientApp {
                     );*/
 
                     if let Ok(chunknode) = ChunkNode::new(Vec::new()) {
-                        let mut data_map: HashMap<NodeHash, MerkleNode> = HashMap::new();
+                        let data_map: HashMap<NodeHash, MerkleNode> = HashMap::new();
-                        data_map.insert(root_hash, MerkleNode::Chunk(chunknode));
+                        //data_map.insert(root_hash, MerkleNode::Chunk(chunknode));
+                        println!("len root: {}", data_map.len());
+                        println!("node hash: {:?}", root_hash.to_vec());
                         let tree = MerkleTree {
                             data: data_map,
                             root: root_hash,
@@ -175,7 +255,53 @@ impl eframe::App for P2PClientApp {
                 NetworkEvent::Error(err) => {
                     self.show_error(err);
                 }
-                NetworkEvent::DataReceived(_, merkle_node) => todo!(),
+                NetworkEvent::InitDownload(hash, ip) => {
+                    if let Some(addr) = &self.active_peer {
+                        if let Some(roottree) = self.loaded_fs.get(addr) {
+                            if let Some(root) = roottree.data.get(&hash) {
+                                let _ = self
+                                    .current_downloading_file_map
+                                    .data
+                                    .insert(hash, root.clone());
+                                let _ = self
+                                    .network_cmd_tx
+                                    .send(NetworkCommand::GetChildren(hash, ip, true));
+                            }
+                        }
+                    }
+                }
+                NetworkEvent::DataReceived(hash, merkle_node, ip) => {
+                    let _ = self
+                        .current_downloading_file_map
+                        .data
+                        .insert(hash, merkle_node.clone());
+
+                    println!("merkle:{}", merkle_node.get_type_byte());
+                    match merkle_node {
+                        MerkleNode::Big(bigfile) => {
+                            for entry in bigfile.children_hashes {
+                                println!("entry: {:?}", entry);
+                                let _ = self.network_cmd_tx.send(NetworkCommand::GetChildren(
+                                    entry,
+                                    ip.clone(),
+                                    true,
+                                ));
+                                self.remaining_chunks.insert(entry);
+                            }
+                            self.remaining_chunks.remove(&hash);
+                        }
+                        MerkleNode::Chunk(chunk) => {
+                            self.remaining_chunks.remove(&hash);
+                        }
+                        _ => {}
+                    }
+                    if self.remaining_chunks.is_empty() {
+                        println!("bigfile téléchargé");
+                    }
+                }
+                NetworkEvent::Success(msg) => {
+                    self.show_success(msg);
+                }
                 NetworkEvent::HandshakeFailed() => {}
                 NetworkEvent::ServerHandshakeFailed(err) => {
                     self.active_server = "".to_string();
@@ -242,64 +368,7 @@ impl eframe::App for P2PClientApp {
                         }
                         _ => {}
                     }
-
-                    /* ui.horizontal(|ui| {
-                        ui.label("Server peer name:");
-                        ui.text_edit_singleline(&mut self.connect_server_name_input);
-                        if ui.button("Connect").clicked() {
-                            let addr = self.connect_address_input.clone();
-                            let serv_name = self.connect_server_name_input.clone();
-                            let _ = self
-                                .network_cmd_tx
-                                .send(NetworkCommand::ConnectToServer(addr, serv_name));
-                            self.server_status = ServerStatus::Loading;
-                            ui.close();
-                        }
-                    });*/
                 });
-
-                // état
-
-                /*if ui.button("Network").clicked() {
-                    self.show_network_popup = true;
-                }*/
-
-                /*if self.show_network_popup {
-                    egui::Window::new("Network")
-                        .collapsible(false)
-                        .resizable(false)
-                        .show(ctx, |ui| {
-                            ui.horizontal_wrapped(|ui| {
-                                ui.with_layout(
-                                    egui::Layout::right_to_left(egui::Align::TOP),
-                                    |ui| {
-                                        if ui.button("✕").clicked() {
-                                            self.show_network_popup = false;
-                                        }
-                                    },
-                                );
-                            });
-                            ui.horizontal(|ui| {
-                                ui.label("Server IP:");
-                                ui.text_edit_singleline(&mut self.connect_address_input);
-                            });
-                            ui.horizontal(|ui| {
-                                ui.label("Server peer name:");
-                                ui.text_edit_singleline(&mut self.connect_server_name_input);
-                                if ui.button("Connect").clicked() {
-                                    // envoyer commande...
-                                    let addr = self.connect_address_input.clone();
-                                    let serv_name = self.connect_server_name_input.clone();
-                                    let _ = self
-                                        .network_cmd_tx
-                                        .send(NetworkCommand::ConnectToServer(addr, serv_name));
-                                    self.server_status = ServerStatus::Loading;
-
-                                    self.show_network_popup = false;
-                                }
-                            });
-                        });
-                }*/
             });
         });
 
@@ -347,6 +416,11 @@ impl eframe::App for P2PClientApp {
                                 error.to_string()
                             );
                         }
+                        if let Some(active_peer) = &self.active_peer {
+                            if let Some(tree) = self.loaded_fs.get(active_peer) {
+                                println!("{}", tree.data.len());
+                            }
+                        }
                     }
                 });
 
@@ -360,13 +434,24 @@ impl eframe::App for P2PClientApp {
                             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 {
-                                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.
+                                let frame = Frame {
+                                    fill: Color32::DARK_BLUE,
+                                    stroke: Stroke::default(),
+                                    corner_radius: CornerRadius::from(0.5),
+                                    ..Default::default()
+                                };
+                                let internal = frame.show(ui, |ui| {
+                                    ui.selectable_label(is_active, format!("{}", peer.0))
+                                });
+                                selectable = internal.inner;
                             } else {
                                 selectable = ui.selectable_label(is_active, format!("{}", peer.0));
                             }
+
                             if selectable.clicked() {
                                 // switch to displaying this peer's tree
                                 self.active_peer = Some(peer.0.clone());
@@ -476,6 +561,20 @@ impl eframe::App for P2PClientApp {
                 });
             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);
+                    if ui.button("OK").clicked() {
+                        self.clear_success();
+                    }
+                });
+            ctx.request_repaint();
+        }
 
         ctx.request_repaint_after(std::time::Duration::from_millis(10));
     }
@@ -514,11 +613,12 @@ impl P2PClientApp {
         if let Some(current) = tree.data.get(&to_draw) {
             let name = {
                 if filename.is_some() {
-                    filename_to_string(filename.unwrap())
+                    String::from_utf8(filename.unwrap().to_vec()).expect("err")
                 } else {
                     node_hash_to_hex_string(&to_draw)
                 }
             };
+
             match current {
                 MerkleNode::Chunk(node) => {
                     if ui
@@ -526,11 +626,30 @@ impl P2PClientApp {
                         .on_hover_text("Click to request file chunks...")
                         .clicked()
                     {
-                        todo!();
+                        match create_dir("./Download/") {
+                            Ok(_) => println!("Directory created successfully!"),
+                            Err(e) => println!("Failed to create directory: {}", e),
+                        }
+
+                        let new_name = format!("./Download/{}", name);
+
+                        let sani = remove_null_bytes(&new_name);
+
+                        println!("sani:{}", sani);
+
+                        let mut file = OpenOptions::new()
+                            .append(true)
+                            .create(true)
+                            .open(sani)
+                            .unwrap();
+
+                        big_or_chunk_to_file(tree, &MerkleNode::Chunk(node.clone()), &mut file);
+
                         // if let Some(peer_id) = active_peer_id.clone() {
                         //     let _ = self.network_cmd_tx.send(NetworkCommand::RequestChunk(peer_id, entry_hash.clone()));
                         //     // self.status_message = format!("Requested file chunks for: {}...", &entry_hash[..8]);
                         // }
+                        //  todo!();
                     }
                 }
                 MerkleNode::Directory(node) => {
@@ -544,26 +663,23 @@ impl P2PClientApp {
                                     entry.content_hash,
                                     tree,
                                     depth + 1,
-                                    Some(
+                                    Some(entry.filename.try_into().expect("incorrect size")),
-                                        entry
-                                            .filename
-                                            .as_slice()
-                                            .try_into()
-                                            .expect("incorrect size"),
-                                    ),
                                 );
                             }
                         });
                 }
                 MerkleNode::Big(node) => {
-                    CollapsingHeader::new(format!("📄 (B) {}", name))
+                    if ui
-                        .default_open(false)
+                        .selectable_label(false, format!("📄 (B) {}", name))
-                        .enabled(true)
+                        .on_hover_text("Click to request file chunks...")
-                        .show(ui, |ui| {
+                        .clicked()
-                            for child in &node.children_hashes {
+                    {
-                                self.draw_file_node(ui, child.clone(), tree, depth + 1, None);
+                        if let Some(addr) = &self.active_peer {
-                            }
+                            let _ = self
-                        });
+                                .network_cmd_tx
+                                .send(NetworkCommand::InitDownload(to_draw, addr.clone()));
+                        }
+                    }
                 }
                 MerkleNode::BigDirectory(node) => {
                     CollapsingHeader::new(format!("📁 (BD) {}", name))

client-network/src/cryptographic_signature.rs

@@ -134,7 +134,7 @@ pub fn sign_message(crypto_pair: &CryptographicSignature, message: &Vec<u8>) ->
 #[cfg(test)]
 mod tests {
     use super::*;
-
+    /*
     ///
     /// creates a cryptographic signature
     ///
@@ -144,7 +144,7 @@ mod tests {
         let crypto_pair = CryptographicSignature::new(username);
         let formatted_pubkey = formatPubKey(crypto_pair);
         println!("pubkey : {}", formatted_pubkey);
-    }
+    }*/
 
     /*#[test]
     fn signing_message() {

client-network/src/data.rs

@@ -1,7 +1,15 @@
 use rand::{Rng, rng};
+use sha2::{Digest, Sha256};
 use std::collections::HashMap;
 use std::hash::{DefaultHasher, Hash, Hasher};
 
+use std::fs::{File, OpenOptions, create_dir};
+use std::io::{self, Write};
+
+use std::env;
+
+use crate::data;
+
 // --- Constants ---
 pub const MAX_CHUNK_DATA_SIZE: usize = 1024;
 pub const MAX_DIRECTORY_ENTRIES: usize = 16;
@@ -24,9 +32,9 @@ pub enum MerkleNode {
     // 0 to 16 directory entries.
     Directory(DirectoryNode) = 1,
     // list of 2 to 32 hashes pointing to Chunk or Big nodes.
-    Big(BigNode) = 3,
+    Big(BigNode) = 2,
     // list of 2 to 32 hashes pointing to Directory or BigDirectory nodes.
-    BigDirectory(BigDirectoryNode) = 4,
+    BigDirectory(BigDirectoryNode) = 3,
 }
 
 #[derive(Debug, Clone)]
@@ -39,6 +47,9 @@ impl MerkleTree {
     pub fn new(data: HashMap<NodeHash, MerkleNode>, root: NodeHash) -> MerkleTree {
         MerkleTree { data, root }
     }
+    pub fn clear_data(&mut self) {
+        self.data.clear();
+    }
 }
 
 #[derive(Debug, Clone)]
@@ -176,3 +187,336 @@ impl MerkleNode {
         bytes
     }
 }
+
+fn hash(data: &[u8]) -> NodeHash {
+    let root_hash = Sha256::digest(&data);
+    println!("root hash: {:?}", root_hash);
+    let res: NodeHash = root_hash.try_into().expect("incorrect size");
+    res
+    /*let mut hasher = DefaultHasher::new();
+    data.hash(&mut hasher);
+    let hash_u64 = hasher.finish();
+
+    let mut hash_array = [0u8; FILENAME_HASH_SIZE];
+    // Simple way to spread a 64-bit hash across 32 bytes for a unique-ish ID
+    for i in 0..8 {
+        hash_array[i] = (hash_u64 >> (i * 8)) as u8;
+    }
+    hash_array // The rest remains 0, satisfying the 32-byte requirement
+    */
+}
+
+fn generate_random_filename() -> [u8; FILENAME_HASH_SIZE] {
+    let mut rng = rand::rng();
+    let mut filename_bytes = [0; FILENAME_HASH_SIZE];
+
+    // Generate a random length for the base name
+    let name_len = rng.random_range(5..21);
+
+    // Generate random alphanumeric characters
+    for i in 0..name_len {
+        let char_code = rng.random_range(97..123); // 'a' through 'z'
+        if i < FILENAME_HASH_SIZE {
+            filename_bytes[i] = char_code as u8;
+        }
+    }
+
+    // Append a common extension
+    let ext = if rng.random_bool(0.5) { ".txt" } else { ".dat" };
+    let ext_bytes = ext.as_bytes();
+    let start_index = name_len.min(FILENAME_HASH_SIZE - ext_bytes.len());
+    if start_index < FILENAME_HASH_SIZE {
+        filename_bytes[start_index..(start_index + ext_bytes.len())].copy_from_slice(ext_bytes);
+    }
+
+    filename_bytes
+}
+
+fn generate_random_file_node(
+    storage: &mut HashMap<NodeHash, MerkleNode>,
+) -> Result<NodeHash, String> {
+    let mut rng = rng();
+    let is_big = rng.random_bool(0.2); // 20% chance of being a big file
+
+    if !is_big {
+        // Generate a simple Chunk Node
+        let node = MerkleNode::Chunk(ChunkNode::new_random());
+        let hash = hash(&node.serialize());
+        storage.insert(hash, node);
+        Ok(hash)
+    } else {
+        // Generate a Big Node (a file composed of chunks)
+        let num_children = rng.random_range(MIN_BIG_CHILDREN..=MAX_BIG_CHILDREN.min(8)); // Limit complexity
+        let mut children_hashes = Vec::with_capacity(num_children);
+
+        for _ in 0..num_children {
+            // Children must be Chunk or Big; for simplicity, we only generate Chunk children here.
+            let chunk_node = MerkleNode::Chunk(ChunkNode::new_random());
+            let chunk_hash = hash(&chunk_node.serialize());
+            storage.insert(chunk_hash, chunk_node);
+            children_hashes.push(chunk_hash);
+        }
+
+        let node = MerkleNode::Big(BigNode::new(children_hashes)?);
+        let hash = hash(&node.serialize());
+        storage.insert(hash, node);
+        Ok(hash)
+    }
+}
+
+fn generate_random_directory_node(
+    depth: u32,
+    max_depth: u32,
+    storage: &mut HashMap<NodeHash, MerkleNode>,
+) -> Result<NodeHash, String> {
+    let mut rng = rng();
+    let current_depth = depth + 1;
+    let is_big_dir = rng.random_bool(0.3) && current_depth < max_depth;
+
+    if !is_big_dir || current_depth >= max_depth {
+        // Generate a simple Directory Node (leaf level directory)
+        let num_entries = rng.random_range(1..=MAX_DIRECTORY_ENTRIES.min(5)); // Limit directory size for testing
+        let mut entries = Vec::with_capacity(num_entries);
+
+        for _ in 0..num_entries {
+            if rng.random_bool(0.7) {
+                // 70% chance of creating a file (Chunk/Big)
+                let file_hash = generate_random_file_node(storage)?;
+                let entry = DirectoryEntry {
+                    filename: generate_random_filename(),
+                    content_hash: file_hash,
+                };
+                entries.push(entry);
+            } else if current_depth < max_depth {
+                // 30% chance of creating a subdirectory
+                let dir_hash = generate_random_directory_node(current_depth, max_depth, storage)?;
+
+                // Create a basic directory entry name
+                let mut filename_bytes = [0; 32];
+                let subdir_name = format!("dir_{}", current_depth);
+                filename_bytes[..subdir_name.len()].copy_from_slice(subdir_name.as_bytes());
+
+                let entry = DirectoryEntry {
+                    filename: filename_bytes,
+                    content_hash: dir_hash,
+                };
+                entries.push(entry);
+            }
+        }
+
+        let node = MerkleNode::Directory(DirectoryNode::new(entries)?);
+        let hash = hash(&node.serialize());
+        storage.insert(hash, node);
+        Ok(hash)
+    } else {
+        // Generate a BigDirectory Node (internal directory structure)
+        let num_children = rng.random_range(MIN_BIG_CHILDREN..=MAX_BIG_CHILDREN.min(4)); // Limit children count
+        let mut children = Vec::with_capacity(num_children);
+
+        for _ in 0..num_children {
+            // Children must be Directory or BigDirectory
+            let child_hash = generate_random_directory_node(current_depth, max_depth, storage)?;
+            children.push(child_hash);
+        }
+
+        let node = MerkleNode::BigDirectory(BigDirectoryNode::new(children)?);
+        let hash = hash(&node.serialize());
+        storage.insert(hash, node);
+        Ok(hash)
+    }
+}
+
+pub fn generate_random_tree(
+    max_depth: u32,
+) -> Result<(NodeHash, HashMap<NodeHash, MerkleNode>), String> {
+    let mut storage = HashMap::new();
+
+    // Start tree generation from the root directory at depth 0
+    let root_hash = generate_random_directory_node(0, max_depth, &mut storage)?;
+
+    Ok((root_hash, storage))
+}
+
+pub fn generate_base_tree() -> MerkleTree {
+    let mut res = HashMap::new();
+
+    let bob_content = "where is bob".to_string().into_bytes();
+    let alice_content = "alice".to_string().into_bytes();
+    let oscar_content = "oscar is the opponent".to_string().into_bytes();
+
+    let mut children_nodes = Vec::new();
+    for i in 0..10 {
+        let mut i_nodes = Vec::new();
+        for j in 0..10 {
+            let node1 = MerkleNode::Chunk(ChunkNode::new(bob_content.clone()).unwrap());
+            let hash = hash(&node1.serialize());
+            i_nodes.push(hash);
+            res.insert(hash, node1);
+        }
+        let bignode = MerkleNode::Big(BigNode::new(i_nodes).unwrap());
+        let hashbig = hash(&bignode.serialize());
+        children_nodes.push(hashbig);
+        res.insert(hashbig, bignode);
+    }
+
+    let bignode = MerkleNode::Big(BigNode::new(children_nodes).unwrap());
+    let hashbig = hash(&bignode.serialize());
+
+    let node1 = MerkleNode::Chunk(ChunkNode::new(bob_content).unwrap());
+    let hash1 = hash(&node1.serialize());
+
+    let node2 = MerkleNode::Chunk(ChunkNode::new(alice_content).unwrap());
+    let hash2 = hash(&node2.serialize());
+
+    //res.insert(hash1, node1);
+    //res.insert(hash2, node2);
+    res.insert(hashbig, bignode);
+
+    let node3 = MerkleNode::Chunk(ChunkNode::new(oscar_content).unwrap());
+    let hash3 = hash(&node3.serialize());
+
+    //res.insert(hash3, node3);
+
+    let dir1 = MerkleNode::Directory(DirectoryNode {
+        entries: [DirectoryEntry {
+            filename: generate_random_filename(),
+            content_hash: hash3,
+        }]
+        .to_vec(),
+    });
+    let hash_dir1 = hash(&dir1.serialize());
+
+    //res.insert(hash_dir1, dir1);
+
+    let root = MerkleNode::Directory(DirectoryNode {
+        entries: [
+            DirectoryEntry {
+                filename: generate_random_filename(),
+                content_hash: hashbig,
+            },
+            /*DirectoryEntry {
+                filename: generate_random_filename(),
+                content_hash: hash2,
+            },
+            DirectoryEntry {
+                filename: generate_random_filename(),
+                content_hash: hash_dir1,
+            },*/
+        ]
+        .to_vec(),
+    });
+
+    let root_hash = Sha256::digest(&root.serialize());
+    println!("root hash: {:?}", root_hash);
+    res.insert(root_hash.try_into().expect("incorrect size"), root);
+
+    MerkleTree::new(res, root_hash.try_into().expect("incorrect size"))
+}
+
+pub fn node_to_file(tree: &MerkleTree, node: &MerkleNode, path: String, i: u8) {
+    match node.clone() {
+        MerkleNode::Directory(dir) => {
+            if i != 0 {
+                let new_path = format!("{}/fold_{}", path.clone(), i);
+                match create_dir(new_path.clone()) {
+                    Ok(_) => println!("Directory created successfully!"),
+                    Err(e) => println!("Failed to create directory: {}", e),
+                }
+            }
+            for entry in dir.entries {
+                // creer un fichier pour chaque entry
+                if let Ok(filename_str) = String::from_utf8(entry.filename.to_vec()) {
+                    let new_name = format!("{}{}", path.clone(), remove_null_bytes(&filename_str));
+
+                    println!("new_name: {}", new_name);
+                    let file = OpenOptions::new()
+                        .append(true)
+                        .create(true)
+                        .open(new_name.clone());
+                    match file {
+                        Ok(mut fileok) => {
+                            if let Some(current) = tree.data.get(&entry.content_hash) {
+                                big_or_chunk_to_file(&tree, &current, &mut fileok);
+                            }
+                        }
+                        Err(e) => {
+                            eprintln!("error creaation file: {}", e);
+                        }
+                    }
+                }
+            }
+        }
+        MerkleNode::BigDirectory(bigdir) => {
+            for entry in bigdir.children_hashes.iter() {
+                if let Some(current) = tree.data.get(entry) {
+                    node_to_file(tree, current, path.clone(), i + 1);
+                }
+            }
+        }
+        _ => {
+            eprintln!("invalid type of dir");
+        }
+    }
+}
+
+pub fn remove_null_bytes(input: &str) -> String {
+    input.chars().filter(|&c| c != '\0').collect()
+}
+
+pub fn big_or_chunk_to_file(tree: &MerkleTree, node: &MerkleNode, file: &mut File) {
+    match node {
+        MerkleNode::Big(big) => {
+            for entry in big.children_hashes.iter() {
+                if let Some(current) = tree.data.get(entry) {
+                    big_or_chunk_to_file(tree, current, file);
+                }
+            }
+        }
+        MerkleNode::Chunk(chunk) => {
+            println!("wrote data");
+            let _ = file.write_all(&chunk.data);
+        }
+        _ => {
+            println!("invalid type of file");
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    ///
+    /// creates a cryptographic signature
+    ///
+    #[test]
+    fn test_saving_tree() {
+        if let Ok(current_dir) = env::current_dir() {
+            println!("Current working directory: {:?}", current_dir);
+        }
+
+        println!("--------- tree test starts ------------");
+
+        match create_dir("../Download/") {
+            Ok(_) => println!("Directory created successfully!"),
+            Err(e) => println!("Failed to create directory: {}", e),
+        }
+        let tree = generate_base_tree();
+
+        println!("--------- test tree created ------------");
+        if let Some(root_node) = tree.data.get(&tree.root) {
+            node_to_file(&tree, root_node, "../Download/".to_string(), 0);
+        }
+    }
+
+    /*#[test]
+    fn signing_message() {
+        let username = String::from("gamixtreize");
+        let crypto_pair = CryptographicSignature::new(username.clone());
+        let handshake = HandshakeMessage::hello(0, 12, username);
+        let ser = handshake.serialize();
+        let signed_message = sign_message(&crypto_pair, &ser);
+        println!("unsigned_message: {:?}", ser);
+        println!("signed_message: {:?}", signed_message);
+    }*/
+}

client-network/src/datum_parsing.rs

@@ -11,9 +11,9 @@ 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 sigstart = datum_length - 64;
+    let value = &recevied_datum[32..datum_length];
-    let value = &recevied_datum[32..sigstart];
     let value_slice = value.to_vec();
+    println!("valueslice: {:?}, {}", value_slice, value_slice.len());
     let datum_type = value_slice[0];
     match datum_type {
         CHUNK => Some((
@@ -21,14 +21,17 @@ pub fn parse_received_datum(
             MerkleNode::Chunk(crate::ChunkNode { data: value_slice }),
         )),
         DIRECTORY => {
-            let nb_entries = value_slice[1];
             let mut dir_entries = Vec::new();
             let mut offset = 1 as usize;
-            for i in 0..nb_entries {
+            for i in 0..((value_slice.len() - 1) / 64) as u8 {
-                offset = (offset as u8 + 64 * i) as usize;
+                offset = (1 + 64 * i as usize) as usize;
-                let name = &recevied_datum[offset..offset + 32];
+                println!("offset:{}, i:{}", offset, i);
+                let name = &value_slice[offset..offset + 32];
                 let mut hash = [0u8; 32];
-                hash.copy_from_slice(&recevied_datum[offset + 32..offset + 64]);
+                hash.copy_from_slice(&value_slice[offset + 32..offset + 64]);
+                let dp_name = String::from_utf8(name.to_vec()).expect("err");
+                println!("name:{}", dp_name);
+
                 // envoyer un datum request
                 dir_entries.push(DirectoryEntry {
                     filename: name.try_into().expect("incorrect size"),
@@ -46,6 +49,7 @@ pub fn parse_received_datum(
             }
         }
         BIG => {
+            println!("its a BIG bro");
             let chlidren: Vec<NodeHash> = Vec::new();
             Some((
                 hash_name,
@@ -53,28 +57,20 @@ pub fn parse_received_datum(
                     children_hashes: chlidren,
                 }),
             ))
-            /*let chlidren: Vec<NodeHash> = Vec::new();
-            tree.data.insert(
-                hash_name,
-                MerkleNode::Big(crate::BigNode {
-                    children_hashes: chlidren,
-                }),
-            );*/
         }
         BIGDIRECTORY => {
-            let nb_entries = value_slice[1];
+            let mut bigdir_entries: Vec<NodeHash> = Vec::new();
-            let mut dir_entries = Vec::new();
             let mut offset = 1 as usize;
-            for i in 0..nb_entries {
+            for i in 0..((value_slice.len() - 1) / 32) as u8 {
-                offset = (offset as u8 + 64 * i) as usize;
+                offset = (1 + 32 * i as usize) as usize;
-                let name = &recevied_datum[offset..offset + 32];
+                println!("offset:{}, i:{}", offset, i);
-                let mut hash = [0u8; 32];
+                let hash = &value_slice[offset..offset + 32];
-                hash.copy_from_slice(&recevied_datum[offset + 32..offset + 64]);
+
                 // envoyer un datum request
-                dir_entries.push(hash);
+                bigdir_entries.push(hash.try_into().expect("incorrect size"));
             }
 
-            let current = BigDirectoryNode::new(dir_entries);
+            let current = BigDirectoryNode::new(bigdir_entries);
             match current {
                 Ok(current_node) => Some((hash_name, MerkleNode::BigDirectory(current_node))),
                 Err(e) => {

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,22 +10,27 @@ 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,
     messages_channels::{MultipleSenders, start_receving_thread, start_retry_thread},
     messages_structure::{
-        NATTRAVERSALREQUEST, NATTRAVERSALREQUEST2, PING, ROOTREQUEST, construct_message,
+        DATUM, DATUMREQUEST, NATTRAVERSALREQUEST, NATTRAVERSALREQUEST2, NODATUM, PING, ROOTREQUEST,
+        construct_message,
     },
     peers_refresh::HandshakeHistory,
     registration::{parse_addresses, perform_handshake, register_with_the_server},
     server_communication::{generate_id, get_peer_list},
     threads_handling::Worker,
 };
+use std::collections::HashSet;
 use std::{
-    clone,
     io::Error,
     net::{IpAddr, Ipv4Addr, UdpSocket},
     time::Duration,
@@ -38,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(
@@ -54,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,
         })
@@ -88,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()
     }
@@ -113,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
     }
@@ -147,7 +181,11 @@ pub enum NetworkCommand {
     Disconnect(),
     ResetServerPeer(),
     Discover(String, String, String),
-    GetChildren(String, String),
+    GetChildren([u8; 32], String, bool),
+    SendDatum(MerkleNode, [u8; 32], String),
+    SendNoDatum(Vec<u8>, String),
+    SendRootReply(Vec<u8>, String),
+    InitDownload([u8; 32], String),
     // ...
 }
 
@@ -157,13 +195,17 @@ pub enum NetworkEvent {
     ConnectedHandshake(),
     Disconnected(),
     Error(String),
+    Success(String),
     PeerConnected(String),
     PeerListUpdated(Vec<(String, bool)>),
-    FileTreeReceived([u8; 32], MerkleNode), // peer_id, content
+    FileTreeReceived([u8; 32], MerkleNode, String), // peer_id, content
-    DataReceived(String, MerkleNode),
+    DataReceived([u8; 32], MerkleNode, String),
     FileTreeRootReceived(String, NodeHash),
     HandshakeFailed(),
     ServerHandshakeFailed(String),
+    DatumRequest([u8; 32], String),
+    RootRequest(String),
+    InitDownload([u8; 32], String),
     // ...
 }
 
@@ -204,6 +246,81 @@ 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) => {
+                        if let Some(sd) = shared_data.as_ref() {
+                            if let Some(res) = sd.handshake_peers.get_peer_info_username(ip) {
+                                let _ = event_tx
+                                    .send(NetworkEvent::InitDownload(hash, res.ip.to_string()));
+                            }
+                        }
+                    }
+                    NetworkCommand::SendRootReply(node_hash, addr) => {
+                        if let Some(sd) = shared_data.as_mut() {
+                            let mut payload = Vec::new();
+                            payload.extend_from_slice(&node_hash);
+                            let new_id = generate_id();
+                            let message =
+                                construct_message(ROOTREPLY, payload, new_id, sd.cryptopair_ref());
+
+                            match message {
+                                None => {}
+                                Some(resp_msg) => {
+                                    println!("msg_sent:{:?}", resp_msg);
+                                    sd.senders_ref().send_dispatch(
+                                        resp_msg,
+                                        addr.clone(),
+                                        false,
+                                        sd.messages_list(),
+                                    );
+                                }
+                            }
+                        }
+                    }
+                    NetworkCommand::SendNoDatum(node_hash, addr) => {
+                        if let Some(sd) = shared_data.as_mut() {
+                            let mut payload = Vec::new();
+                            payload.extend_from_slice(&node_hash);
+                            let new_id = generate_id();
+                            let message =
+                                construct_message(NODATUM, payload, new_id, sd.cryptopair_ref());
+
+                            match message {
+                                None => {}
+                                Some(resp_msg) => {
+                                    println!("msg_sent:{:?}", resp_msg);
+                                    sd.senders_ref().send_dispatch(
+                                        resp_msg,
+                                        addr.clone(),
+                                        false,
+                                        sd.messages_list(),
+                                    );
+                                }
+                            }
+                        }
+                    }
+                    NetworkCommand::SendDatum(merklennode, node_hash, addr) => {
+                        if let Some(sd) = shared_data.as_mut() {
+                            let mut payload = Vec::new();
+                            payload.extend_from_slice(&node_hash);
+                            payload.extend_from_slice(&merklennode.serialize());
+                            let new_id = generate_id();
+                            let message =
+                                construct_message(DATUM, payload, new_id, sd.cryptopair_ref());
+
+                            match message {
+                                None => {}
+                                Some(resp_msg) => {
+                                    println!("msg_sent:{:?}", resp_msg);
+                                    sd.senders_ref().send_dispatch(
+                                        resp_msg,
+                                        addr.clone(),
+                                        false,
+                                        sd.messages_list(),
+                                    );
+                                }
+                            }
+                        }
+                    }
                     NetworkCommand::ServerHandshake(username, ip) => {
                         println!("server handshake called");
                         if let Some(sd) = shared_data.as_mut() {
@@ -218,7 +335,7 @@ pub fn start_p2p_executor(
                                 sd.senders(),
                                 sd.cryptopair(),
                                 sd.messages_list(),
-                                sd.handshake_peers.username_k_peerinfo_v.clone(),
+                                sd.handshake_peers.get_username_peerinfo_map(),
                             );
 
                             let res =
@@ -289,8 +406,41 @@ pub fn start_p2p_executor(
                             println!("no shared data");
                         }
                     }
-                    NetworkCommand::GetChildren(username, hash) => {
+                    NetworkCommand::GetChildren(hash, ip, is_file) => {
-                        // envoie un datum request au peer
+                        if let Some(sd) = shared_data.as_ref() {
+                            let mut payload = Vec::new();
+                            payload.extend_from_slice(&hash);
+                            let new_id = generate_id();
+                            let datumreqest = construct_message(
+                                DATUMREQUEST,
+                                payload,
+                                new_id,
+                                sd.cryptopair_ref(),
+                            );
+                            match datumreqest {
+                                None => {}
+                                Some(resp_msg) => {
+                                    if is_file {
+                                        sd.add_message(new_id, EventType::DatumRequestBig);
+                                    } else {
+                                        sd.add_message(new_id, EventType::DatumRequest);
+                                    }
+                                    println!("msg_sent:{:?}", resp_msg);
+                                    sd.senders_ref().add_message_to_retry_queue(
+                                        resp_msg.clone(),
+                                        ip.clone(),
+                                        false,
+                                    );
+
+                                    sd.senders_ref().send_dispatch(
+                                        resp_msg,
+                                        ip.clone(),
+                                        false,
+                                        sd.messages_list(),
+                                    );
+                                }
+                            }
+                        }
                     }
                     NetworkCommand::RequestDirectoryContent(_, _) => {
                         println!("[Network] RequestDirectoryContent() called");
@@ -338,6 +488,7 @@ 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(),
@@ -367,48 +518,65 @@ 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, 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(),
+                                    //        addr.to_string(),
-                                            false,
+                                    //        false,
-                                        );
+                                    //    );
-                                        sd.senders_ref().send_dispatch(
+                                    //    sd.senders_ref().send_dispatch(
-                                            ping,
+                                    //        ping,
-                                            addr.to_string(),
+                                    //        addr.to_string(),
-                                            false,
+                                    //        false,
-                                            sd.messages_list(),
+                                    //        sd.messages_list(),
-                                        );
+                                    //    );
-                                    }
+                                    //}
+                                    match event_tx.send(NetworkEvent::Success(format!(
+                                        "Successfully sent ping message to {}.",
+                                        addr.to_string()
+                                    ))) {
+                                        Ok(_) => {}
+                                        Err(e) => {
+                                            eprintln!("NetworkEvent error : {}", e);
+                                        }
+                                    };
                                 }
-                                None => {
+                                Err(err_msg) => {
-                                    let err_msg =
+                                    match event_tx.send(NetworkEvent::Error(err_msg.to_string())) {
-                                        format!("failed to retreive socket address:").to_string();
+                                        Ok(_) => {}
-                                    let res = event_tx.send(NetworkEvent::Error(err_msg));
+                                        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");
                         }
@@ -424,45 +592,44 @@ 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())) {
+                                        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));
                                 }
                             }
                         }
@@ -476,7 +643,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;
         }
     })
 }
@@ -506,11 +673,126 @@ 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 = parse_addresses(&s); // assumes parse_addresses: &str -> Vec<SocketAddr>
+    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,
@@ -28,6 +27,34 @@ pub enum EventType {
     Ping,
     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;
@@ -51,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,
@@ -89,6 +117,7 @@ pub fn handle_recevied_message(
         cmd_tx,
         ip,
         messages_list,
+        messages_received,
         handhsake_history,
         senders,
     );
@@ -114,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>> {
@@ -125,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");
@@ -134,6 +172,7 @@ pub fn parse_message(
     match msgtype {
         HELLO | HELLOREPLY => {
             let ilength = u16::from_be_bytes(length_bytes);
+            println!("hello");
             println!("name received length: {}", ilength);
             let received_name = &received_message[LENGTH + EXTENSIONS..LENGTH + ilength as usize];
             let received_username = String::from_utf8(received_name.to_vec());
@@ -147,12 +186,14 @@ pub fn parse_message(
                                 .block_on(get_peer_key(&username))
                                 .expect("failed to retrieve public key"),
                         };
-                    println!("handshake JULIUS added");
+                    match msgtype {
-                    handhsake_history.add_new_handshake(peer_pubkey, "".to_string(), ip);
+                        HELLOREPLY => {
-                    let signature: [u8; SIGNATURE] = received_message
+                            handhsake_history.add_new_handshake(peer_pubkey, "".to_string(), ip);
-                        [LENGTH + msg_length..LENGTH + msg_length + SIGNATURE]
+                        }
-                        .try_into()
+                        _ => {
-                        .expect("Taille incorrecte");
+                            println!("no handshake added");
+                        }
+                    }
                     if !verify_signature(peer_pubkey, &received_message) {
                         println!(
                             "incorrect signature from given peer: {}, ignoring message of type {} with id {}",
@@ -417,8 +458,34 @@ pub fn parse_message(
                             parse_received_datum(received_datum.to_vec(), received_length as usize);
                         match parsed_node {
                             Some(tuple) => {
-                                let _ =
+                                let _ = cmd_tx.send(NetworkEvent::FileTreeReceived(
-                                    cmd_tx.send(NetworkEvent::FileTreeReceived(tuple.0, tuple.1));
+                                    tuple.0,
+                                    tuple.1,
+                                    ip.to_string(),
+                                ));
+                            }
+                            None => {}
+                        }
+                    }
+                    EventType::DatumRequestBig => {
+                        let _ = &guard.remove_entry(&id);
+                        println!("message {} retiré de la liste", id);
+                        let received_length = u16::from_be_bytes(
+                            received_message[TYPE..LENGTH]
+                                .try_into()
+                                .expect("incorrect size"),
+                        );
+                        let received_datum = &received_message[LENGTH..];
+                        let parsed_node =
+                            parse_received_datum(received_datum.to_vec(), received_length as usize);
+                        match parsed_node {
+                            Some(tuple) => {
+                                let _ = cmd_tx.send(NetworkEvent::DataReceived(
+                                    tuple.0,
+                                    tuple.1,
+                                    ip.to_string(),
+                                ));
+                                println!("datareceived event sent");
                             }
                             None => {}
                         }
@@ -428,6 +495,22 @@ pub fn parse_message(
                 None => {}
             }
         }
+        ROOTREQUEST => {
+            println!("root request received");
+            let _ = cmd_tx.send(NetworkEvent::RootRequest(ip.to_string()));
+        }
+        DATUMREQUEST => {
+            let received_length = u16::from_be_bytes(
+                received_message[TYPE..LENGTH]
+                    .try_into()
+                    .expect("incorrect size"),
+            );
+            let received_hash = &received_message[LENGTH..LENGTH + received_length as usize];
+            let _ = cmd_tx.send(NetworkEvent::DatumRequest(
+                received_hash.try_into().expect("incorrect size"),
+                ip.to_string(),
+            ));
+        }
         _ => return None,
     };
     constructed_message

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/messages_structure.rs

@@ -224,7 +224,7 @@ impl HandshakeMessage {
 mod tests {
     // Note this useful idiom: importing names from outer (for mod tests) scope.
     use super::*;
-
+    /*
     /// creates an handshake message
     #[tokio::test]
     async fn creating_handshake_msg() {
@@ -242,5 +242,5 @@ mod tests {
         let parsed = HandshakeMessage::parse(ser);
         handshake.display();
         parsed.display();
-    }
+    }*/
 }

client-network/src/peers_refresh.rs

@@ -90,6 +90,10 @@ impl HandshakeHistory {
         }
     }
 
+    pub fn get_username_peerinfo_map(&self) -> Arc<Mutex<HashMap<String, PeerInfo>>> {
+        self.username_k_peerinfo_v.clone()
+    }
+
     pub fn add_new_handshake(&self, hash: VerifyingKey, username: String, ip: SocketAddr) {
         let peerinfo = PeerInfo {
             username: username.clone(),
@@ -112,14 +116,11 @@ pub fn update_handshake(
     let map_for_thread = username_k_peerinfo_v.clone();
     let handle = thread::spawn(move || {
         loop {
-            println!("loop boucle");
             let guard = map_for_thread.lock().unwrap();
-            println!("len:{}", guard.len());
             for (peer, peerinfo) in guard.iter() {
                 let id = generate_id();
                 let mut map = messages_list.lock().unwrap();
                 map.insert(id, EventType::Ping);
-                drop(map);
                 let pingrequest = construct_message(PING, Vec::new(), id, &crypto_pair);
                 if let Some(ping) = pingrequest {
                     senders.add_message_to_retry_queue(
@@ -133,10 +134,10 @@ pub fn update_handshake(
                         false,
                         messages_list.clone(),
                     );
-                    println!("ping envoye a {}", peer);
                 }
             }
-            thread::sleep(Duration::from_secs(2));
+            drop(guard);
+            thread::sleep(Duration::from_secs(60));
         }
     });
     Worker::spawn(handle, crate::threads_handling::WorkerType::PING)

client-network/src/registration.rs

@@ -1,19 +1,14 @@
-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_socket_address;
+use crate::get_server_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 +24,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> {
@@ -62,10 +62,11 @@ pub async fn perform_handshake(
     let senders = sd.senders_ref();
 
     let id = generate_id();
-    let server_addr_query = get_socket_address(username.clone(), ip.clone());
+    let server_addr_query = get_server_address(username.clone(), ip.clone());
     match server_addr_query.await {
         Some(sockaddr_bytes) => {
             sd.set_servername(username);
+            sd.set_serveraddress(sockaddr_bytes.to_string());
             // first: &SocketAddr
             let mut payload = Vec::new();
             payload.extend_from_slice(&0u32.to_be_bytes());
@@ -115,8 +116,6 @@ pub async fn perform_handshake(
 
 #[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)
+    }
+}

todo.md

@@ -1,24 +1,11 @@
 # Todo
 
-## bugfix
-
-- ajouter hello et nat a l'exp backoff OK
-- peers n'ayant pas d'adresse OK
-- verifier le refresh des peers
-
-- setting in gui to act as a relay
-
-- make hello and helloreply messages set the first extension bit to announce that peer is available for nat traversal
-- implement actual nat traversal requests
-- implement nat traversal :
-    - if hello/helloreply doesnt work with a peer, find a peer that supports nat traversal (server in priority) then begin protocol
 
 ## fonctionnalités :
-
+- proposer des fichiers
-rechercher les fichiers d'un pair
+- telechargement des fichiers
-telechargement des fichiers
+- receivers threads
-choisir un dossier à partager
+- ask for nat traversal
-choisir le nombre de canaux
 
 ## autre
 
@@ -26,6 +13,7 @@ socket ipv6
 
 # FAIT
 
+rechercher les fichiers d'un pair OK
 - choisir un pseudo OK
 - get rsquest to the uri /peers/ OK
 - generation of the cryptographic key OK
@@ -44,3 +32,6 @@ socket ipv6
 - datum/nodatum and datum structures
 - nattraversal 1 and 2 structures
 - chunk, directory, big, bigdirectory structures
+- ajouter hello et nat a l'exp backoff OK
+- peers n'ayant pas d'adresse OK
+- verifier le refresh des peers OK