Merge remote-tracking branch 'origin' into bigfix

client-gui/src/gui_app.rs

@@ -1,18 +1,16 @@
 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,
+    big_or_chunk_to_file, 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, CentralPanel, CollapsingHeader, Color32, Context, CornerRadius, Frame, Layout,
+    Align, CentralPanel, CollapsingHeader, Color32, Context, CornerRadius, Frame, Id, Layout,
-    ProgressBar, Response, ScrollArea, SidePanel, Stroke, TopBottomPanel, Ui, Vec2,
+    ProgressBar, ScrollArea, SidePanel, Stroke, TopBottomPanel, Ui, ViewportCommand,
-    ViewportCommand,
 };
+use std::collections::HashMap;
 use std::collections::HashSet;
-use std::{collections::HashMap, fmt::format, io::Seek};
 
-use std::fs::{File, OpenOptions, create_dir};
+use std::fs::{OpenOptions, create_dir};
 
 enum ServerStatus {
     Loading,
@@ -21,24 +19,19 @@ enum ServerStatus {
     ConnectedHandshake,
 }
 
-// --- Main Application Struct ---
 pub struct P2PClientApp {
     remaining: std::time::Duration,  // temps restant
     last_update: std::time::Instant, // pour calculer delta
     timer_started: bool,
-    // Communication channels
     network_cmd_tx: Sender<NetworkCommand>,
     network_event_rx: Receiver<NetworkEvent>,
 
-    // 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,
 
-    // Key: Parent Directory Hash (String), Value: List of children FileNode
     loaded_fs: HashMap<String, MerkleTree>,
     shared_tree: MerkleTree,
 
@@ -47,8 +40,6 @@ pub struct P2PClientApp {
 
     server_status: ServerStatus,
 
-    show_network_popup: bool, // gérer selon besoin
-
     error_message: Option<(String, String)>, // Some(message) -> afficher, None -> rien
     success_message: Option<(String, String)>, // Some(message) -> afficher, None -> rien
     active_server: String,
@@ -63,16 +54,14 @@ pub struct P2PClientApp {
     current_received_chunks: usize,
 
     root_downloading_file: String,
+    show_network_window: bool,
+    show_choose_server_window: bool,
 }
 
 impl P2PClientApp {
     pub fn new(cmd_tx: Sender<NetworkCommand>, event_rx: Receiver<NetworkEvent>) -> Self {
-        //let (root_hash, tree_content) = MerkleNode::generate_base_tree();
+        let loaded_fs = HashMap::new();
-
+        let current_downloading_file_map = MerkleTree::new(HashMap::new(), [0; 32]);
-        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);
 
         Self {
             remaining: std::time::Duration::from_secs(0),
@@ -80,7 +69,6 @@ impl P2PClientApp {
             last_update: std::time::Instant::now(),
             network_cmd_tx: cmd_tx,
             network_event_rx: event_rx,
-            status_message: "Client Initialized. Awaiting network status...".to_string(),
             known_peers: Vec::new(),
             loading_peers: Vec::new(),
             connect_address_input: "https://jch.irif.fr:8443".to_string(),
@@ -88,7 +76,6 @@ impl P2PClientApp {
             loaded_fs,
             active_peer: None,
             server_status: ServerStatus::NotConnected,
-            show_network_popup: false,
             error_message: None,
             success_message: None,
             connect_name_input: "bob".to_string(),
@@ -99,6 +86,8 @@ impl P2PClientApp {
             current_received_chunks: 0,
             root_downloading_file: "".to_string(),
             remaining_chunks: HashSet::new(),
+            show_network_window: false,
+            show_choose_server_window: false,
         }
     }
     pub fn show_error(&mut self, msg: impl Into<String>, peer_username: impl Into<String>) {
@@ -123,8 +112,6 @@ impl P2PClientApp {
     }
 }
 
-// --- eframe::App Trait Implementation ---
-
 impl eframe::App for P2PClientApp {
     fn update(&mut self, ctx: &Context, _frame: &mut eframe::Frame) {
         if matches!(self.server_status, ServerStatus::Connected) && !self.timer_started {
@@ -133,7 +120,6 @@ impl eframe::App for P2PClientApp {
             self.timer_started = true;
         }
 
-        // in update (every frame)
         let now = std::time::Instant::now();
         let delta = now.saturating_duration_since(self.last_update);
         self.last_update = now;
@@ -144,18 +130,8 @@ impl eframe::App for P2PClientApp {
             self.remaining = self.remaining.saturating_sub(delta);
         }
 
-        // 1. Process incoming Network Events
-        // We poll the channel and update the GUI state for every event received.
         while let Ok(event) = self.network_event_rx.try_recv() {
             match event {
-                NetworkEvent::PeerConnected(addr) => {
-                    todo!();
-
-                    self.status_message = format!("✅ Peer connected: {}", addr);
-                    if !self.known_peers.contains(&(addr, true)) {
-                        self.known_peers.push((addr, true));
-                    }
-                }
                 NetworkEvent::RootRequest(addr) => {
                     let root = self.shared_tree.root;
                     let _ = self
@@ -181,8 +157,6 @@ impl eframe::App for P2PClientApp {
                     }
                 }
                 NetworkEvent::PeerListUpdated(peers) => {
-                    //todo!();
-
                     self.known_peers = peers;
                 }
 
@@ -222,14 +196,6 @@ impl eframe::App for P2PClientApp {
                     }
                 }
                 NetworkEvent::FileTreeRootReceived(peer_id, root_hash) => {
-                    // todo!();
-
-                    /*self.status_message = format!(
-                        "🔄 Received Merkle Root from {}: {}",
-                        peer_id,
-                        &root_hash[..8]
-                    );*/
-
                     if let Ok(chunknode) = ChunkNode::new(Vec::new()) {
                         let data_map: HashMap<NodeHash, MerkleNode> = HashMap::new();
                         //data_map.insert(root_hash, MerkleNode::Chunk(chunknode));
@@ -248,17 +214,11 @@ impl eframe::App for P2PClientApp {
 
                         println!("tree created");
                     }
-
-                    //self.active_peer_id = Some(peer_id.clone());
-
-                    // Request the content of the root directory immediately
-                    /*let _ = self
-                    .network_cmd_tx
-                    .send(NetworkCommand::RequestDirectoryContent(peer_id, root_hash));*/
                 }
                 NetworkEvent::Connected(ip) => {
                     self.server_status = ServerStatus::Connected;
                     self.connected_address = ip.clone();
+                    self.show_choose_server_window = true;
                     let _ = self.network_cmd_tx.send(NetworkCommand::FetchPeerList(
                         self.connected_address.clone(),
                     ));
@@ -280,6 +240,7 @@ impl eframe::App for P2PClientApp {
                     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.current_downloading_file_map.root = hash;
                                 self.root_downloading_file = name;
                                 let _ = self
                                     .current_downloading_file_map
@@ -309,27 +270,21 @@ impl eframe::App for P2PClientApp {
                                     true,
                                 ));
                                 self.remaining_chunks.insert(entry);
-                                self.set_current_total_chunks(Some(self.remaining_chunks.len()));
+                                self.current_total_chunks = Some(self.remaining_chunks.len());
                             }
                             self.remaining_chunks.remove(&hash);
                         }
-                        MerkleNode::Chunk(chunk) => {
+                        MerkleNode::Chunk(_) => {
                             self.remaining_chunks.remove(&hash);
                         }
                         _ => {}
                     }
-
+                    println!("remaining chunks size: {}", self.remaining_chunks.len());
-                    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()
+                        let file = OpenOptions::new().append(true).create(true).open(
-                            .append(true)
+                            "./Download/".to_string()
-                            .create(true)
+                                + &remove_null_bytes(&self.root_downloading_file.clone()),
-                            .open(self.root_downloading_file.clone());
+                        );
 
                         if let Some(current) = self
                             .current_downloading_file_map
@@ -348,10 +303,22 @@ impl eframe::App for P2PClientApp {
                                     eprintln!("error creaation file: {}", e);
                                 }
                             }
-                        }*/
+                        } else {
-                        self.current_total_chunks = None;
+                            eprintln!("error root absent");
-                        self.current_received_chunks = 0;
+                        }
-                        println!("bigfile téléchargé");
+                        println!("bigfile téléchargé {}", self.root_downloading_file);
+
+                        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() {
+                            self.current_total_chunks = None;
+                            self.current_received_chunks = 0;
+                            println!("bigfile téléchargé");
+                        }
                     }
                 }
                 NetworkEvent::Success(msg, peer_username) => {
@@ -364,26 +331,115 @@ impl eframe::App for P2PClientApp {
                     self.server_status = ServerStatus::NotConnected;
                     let err_msg = format!("Failed to connect to the server: {}", err);
                     self.show_error(err_msg, "");
-                    let res = self.network_cmd_tx.send(NetworkCommand::ResetServerPeer());
+                    match self.network_cmd_tx.send(NetworkCommand::ResetServerPeer()) {
+                        Ok(_) => {}
+                        Err(err) => {
+                            println!("GUI Error : {}", err.to_string());
+                        }
+                    };
                 }
             }
         }
 
+        if self.show_choose_server_window {
+            let full_rect = ctx.input(|i| i.content_rect());
+            let modal_size = egui::vec2(400.0, 160.0);
+
+            egui::Area::new(Id::new("modal_blocker_bg"))
+                .order(egui::Order::Background)
+                .show(ctx, |ui| {
+                    let painter = ui.painter();
+                    painter.rect_filled(full_rect, 0.0, egui::Color32::from_black_alpha(160));
+
+                    let sense = egui::Sense::click_and_drag();
+                    ui.allocate_exact_size(full_rect.size(), sense);
+                });
+            egui::Window::new("Choose the server")
+                .resizable(false)
+                .collapsible(false)
+                .title_bar(true)
+                .anchor(egui::Align2::CENTER_CENTER, egui::Vec2::ZERO)
+                .fixed_size(modal_size)
+                .show(ctx, |ui| {
+                    ScrollArea::vertical()
+                        .auto_shrink([false; 2])
+                        .show(ui, |ui| {
+                            ui.style_mut().visuals.widgets.inactive.bg_fill =
+                                ui.style().visuals.widgets.inactive.bg_fill; // no-op to get mutable borrow
+                            if self.known_peers.is_empty() {
+                                ui.add_space(10.0);
+                                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
+
+                                    // 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
+
+                                        // use resp (click handling etc.)
+                                        if resp.clicked() {
+                                            self.active_server = peer.0.to_string();
+                                            match self.network_cmd_tx.send(
+                                                NetworkCommand::ServerHandshake(
+                                                    peer.0.to_string(),
+                                                    self.connected_address.clone(),
+                                                ),
+                                            ) {
+                                                Ok(_) => {}
+                                                Err(e) => {
+                                                    println!("GUI Error : {}", e.to_string());
+                                                }
+                                            };
+                                            ui.close();
+                                            self.show_choose_server_window = false;
+                                        }
+                                    });
+                                }
+                            }
+                        });
+                });
+        }
+
         // 2. Menu Bar
         TopBottomPanel::top("top_panel").show(ctx, |ui| {
             egui::MenuBar::new().ui(ui, |ui| {
                 ui.menu_button("File", |ui| {
-                    if ui.button("Settings").clicked() {
+                    if ui.button("Settings").clicked() {}
-                        //show settings
-                    }
 
                     if ui.button("Quit").clicked() {
-                        // Use ViewportCommand to request a close
                         ctx.send_viewport_cmd(ViewportCommand::Close);
                     }
                 });
 
-                ui.menu_button("Network", |ui| {
+                if ui.button("Network").clicked() {
+                    self.show_network_window = true;
+                }
+
+                if self.show_network_window {
                     match self.server_status {
                         ServerStatus::Connected | ServerStatus::ConnectedHandshake => {
                             let desired = egui::vec2(300.0, 0.0); // width 300, auto-height if 0
@@ -395,36 +451,42 @@ impl eframe::App for P2PClientApp {
                                     self.server_status = ServerStatus::NotConnected;
                                     self.remaining = std::time::Duration::from_secs(0);
                                     self.timer_started = false;
-                                    ui.close();
+                                    self.show_network_window = false;
                                 }
                             });
                         }
                         ServerStatus::NotConnected => {
-                            let desired = egui::vec2(0.0, 0.0); // width 300, auto-height if 0
+                            egui::Window::new("Network")
-                            ui.set_min_size(desired);
+                                .resizable(false)
-                            ui.vertical(|ui| {
+                                .show(ctx, |ui| {
-                                ui.horizontal(|ui| {
+                                    ui.horizontal(|ui| {
-                                    ui.label("Server IP:");
+                                        ui.label("Server IP:");
-                                    ui.text_edit_singleline(&mut self.connect_address_input);
+                                        ui.text_edit_singleline(&mut self.connect_address_input);
+                                    });
+                                    ui.horizontal(|ui| {
+                                        ui.label("Name:");
+                                        ui.text_edit_singleline(&mut self.connect_name_input);
+                                    });
+                                    if ui.button("Connect").clicked() {
+                                        let addr = self.connect_address_input.clone();
+                                        let name = self.connect_name_input.clone();
+                                        let _ = self.network_cmd_tx.send(
+                                            NetworkCommand::ConnectToServerPut(
+                                                addr,
+                                                name.to_string(),
+                                            ),
+                                        );
+                                        self.server_status = ServerStatus::Loading;
+                                        ui.close();
+                                        self.show_network_window = false;
+                                        self.loaded_fs
+                                            .insert(name.to_string(), self.shared_tree.clone());
+                                    }
                                 });
-                                ui.horizontal(|ui| {
-                                    ui.label("Name:");
-                                    ui.text_edit_singleline(&mut self.connect_name_input);
-                                });
-                                if ui.button("Connect").clicked() {
-                                    let addr = self.connect_address_input.clone();
-                                    let name = self.connect_name_input.clone();
-                                    let _ = self
-                                        .network_cmd_tx
-                                        .send(NetworkCommand::ConnectToServerPut(addr, name));
-                                    self.server_status = ServerStatus::Loading;
-                                    ui.close();
-                                }
-                            });
                         }
                         _ => {}
                     }
-                });
+                }
             });
         });
 
@@ -502,92 +564,69 @@ impl eframe::App for P2PClientApp {
                             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: Response;
+                                if peer.0.eq(&self.connect_name_input) {
-                                // if &self.active_server == &peer.0 {
+                                    ui.horizontal(|ui| {
-                                //     // Create a frame with green background and render the selectable inside it.
+                                        let resp = ui.selectable_label(
-                                //     // Adjust rounding, padding and stroke as desired.
+                                            is_active,
-                                //     let frame = Frame {
+                                            format!("{} (you)", peer.0),
-                                //         fill: Color32::DARK_BLUE,
-                                //         stroke: Stroke::default(),
-                                //         corner_radius: CornerRadius::from(0.5),
-                                //         ..Default::default()
-                                //     };
-                                //     let internal = frame.show(ui, |ui| {
-                                //         // horizontal row: label on the left, spinner on the right
-                                //         ui.horizontal(|ui| {
-                                //             // let selectable label take remaining space
-                                //             ui.with_layout(Layout::left_to_right(Align::Center), |ui| {
-                                //                 ui.add_space(0.0); // ensure layout established
-                                //                 return ui.selectable_label(
-                                //                     is_active,
-                                //                     format!("{}", peer.0),
-                                //                 );
-                                //             })
-                                //             .inner // return Response from the inner closure if your egui version does so
-                                //         })
-                                //     });
-                                //     selectable = internal.inner.inner;
-                                // } else {
-                                //     selectable = ui.selectable_label(is_active, format!("{}", peer.0));
-                                // }
-
-                                // 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() {
-                                    if resp.clicked() {
+                                            self.active_peer = Some(peer.0.clone());
-                                        // 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(),
-                                                ));
                                         }
-                                    }
+                                    });
-                                    resp.context_menu(|ui| {
+                                } else {
-                                    // ... action
+                                    // place spinner to the right of the label
+                                    ui.horizontal(|ui| {
+                                        let resp = if &self.active_server == &peer.0 {
+                                            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) {
+                                            ui.with_layout(
+                                                Layout::right_to_left(Align::Center),
+                                                |ui| {
+                                                    ui.spinner();
+                                                },
+                                            );
+                                        }
+
+                                        if resp.clicked() {
+                                            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(),
+                                                    ),
+                                                );
+                                            }
+                                        }
+                                        resp.context_menu(|ui| {
                                     match self.server_status {
                                         ServerStatus::Connected => {
                                             if ui
@@ -595,12 +634,17 @@ impl eframe::App for P2PClientApp {
                                                 .clicked()
                                             {
                                                 self.active_server = peer.0.to_string();
-                                                let res = self.network_cmd_tx.send(
+                                                match self.network_cmd_tx.send(
                                                     NetworkCommand::ServerHandshake(
                                                         peer.0.to_string(),
                                                         self.connected_address.clone(),
                                                     ),
-                                                );
+                                                ) {
+                                                Ok(_) => {}
+                                                Err(e) => {
+                                                    println!("GUI Error : {}", e.to_string());
+                                                },
+                                                };
                                             }
                                         }
                                         _ => {}
@@ -637,75 +681,8 @@ impl eframe::App for P2PClientApp {
 
                                     // ... 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
-                                //});
                             }
                         }
                     });

client-gui/src/main.rs

@@ -32,7 +32,7 @@ async fn main() -> eframe::Result<()> {
     eframe::run_native(
         "p2p-merkle client",
         options,
-        Box::new(|cc| {
+        Box::new(|_| {
             let app = P2PClientApp::new(network_cmd_tx, network_event_rx);
             Ok(Box::new(app))
         }),

client-network/src/data.rs

@@ -473,8 +473,15 @@ pub fn big_or_chunk_to_file(tree: &MerkleTree, node: &MerkleNode, file: &mut Fil
             }
         }
         MerkleNode::Chunk(chunk) => {
-            println!("wrote data");
+            if !chunk.data.is_empty() {
-            let _ = file.write_all(&chunk.data);
+                // Enlève le premier élément
+                let mut data = chunk.data.clone(); // Clone pour éviter de modifier l'original
+                data.remove(0); // Enlève le premier élément
+                println!("wrote data {:?}", data);
+                let _ = file.write(&data);
+            } else {
+                println!("chunk.data is empty, nothing to write");
+            }
         }
         _ => {
             println!("invalid type of file");

client-network/src/datum_parsing.rs

@@ -11,84 +11,103 @@ 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..recevied_datum.len()];
+    let value = &recevied_datum[32..datum_length];
     let value_slice = value.to_vec();
     println!("valueslice: {:?}, {}", value_slice, value_slice.len());
-    let datum_type = value_slice[0];
-    match datum_type {
-        CHUNK => Some((
-            hash_name,
-            MerkleNode::Chunk(crate::ChunkNode { data: value_slice }),
-        )),
-        DIRECTORY => {
-            let mut dir_entries = Vec::new();
-            let mut offset = 1 as usize;
-            for i in 0..((value_slice.len() - 1) / 64) as u8 {
-                offset = (1 + 64 * i as usize) as usize;
-                println!("offset:{}, i:{}", offset, i);
-                let name = &value_slice[offset..offset + 32];
-                let mut hash = [0u8; 32];
-                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
+    println!(
-                dir_entries.push(DirectoryEntry {
+        "((value_slice.len() - 1) / 32) {} ",
-                    filename: name.try_into().expect("incorrect size"),
+        ((value_slice.len() - 1) / 32)
-                    content_hash: hash,
+    );
-                });
+    // Créer une instance de Sha256
-            }
+    let mut hasher = Sha256::new();
 
-            let current = DirectoryNode::new(dir_entries);
+    // Alimenter le hasher avec les données
-            match current {
+    hasher.update(value_slice.clone());
-                Ok(current_node) => Some((hash_name, MerkleNode::Directory(current_node))),
-                Err(e) => {
-                    println!("{}", e);
-                    None
-                }
-            }
-        }
-        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
+    // Obtention du résultat
-                bigdir_entries.push(hash.try_into().expect("incorrect size"));
+    let result = hasher.finalize();
-            }
+    if result.to_vec() != hash_name.to_vec() {
-
+        println!("{:?},{:?}", result.to_vec(), hash_name.to_vec());
-            println!("its a BIG bro");
+        None
-            Some((
+    } else {
+        println!("hashes equals!");
+        let datum_type = value_slice[0];
+        match datum_type {
+            CHUNK => Some((
                 hash_name,
-                MerkleNode::Big(crate::BigNode {
+                MerkleNode::Chunk(crate::ChunkNode { data: value_slice }),
-                    children_hashes: bigdir_entries,
+            )),
-                }),
+            DIRECTORY => {
-            ))
+                let mut dir_entries = Vec::new();
-        }
+                let mut offset = 1 as usize;
-        BIGDIRECTORY => {
+                for i in 0..((value_slice.len() - 1) / 64) as u8 {
-            let mut bigdir_entries: Vec<NodeHash> = Vec::new();
+                    offset = (1 + 64 * i as usize) as usize;
-            let mut offset = 1 as usize;
+                    println!("offset:{}, i:{}", offset, i);
-            for i in 0..((value_slice.len() - 1) / 32) as u8 {
+                    let name = &value_slice[offset..offset + 32];
-                offset = (1 + 32 * i as usize) as usize;
+                    let mut hash = [0u8; 32];
-                println!("offset:{}, i:{}", offset, i);
+                    hash.copy_from_slice(&value_slice[offset + 32..offset + 64]);
-                let hash = &value_slice[offset..offset + 32];
+                    let dp_name = String::from_utf8(name.to_vec()).expect("err");
+                    println!("name:{}", dp_name);
 
-                // envoyer un datum request
+                    // envoyer un datum request
-                bigdir_entries.push(hash.try_into().expect("incorrect size"));
+                    dir_entries.push(DirectoryEntry {
-            }
+                        filename: name.try_into().expect("incorrect size"),
+                        content_hash: hash,
+                    });
+                }
 
-            let current = BigDirectoryNode::new(bigdir_entries);
+                let current = DirectoryNode::new(dir_entries);
-            match current {
+                match current {
-                Ok(current_node) => Some((hash_name, MerkleNode::BigDirectory(current_node))),
+                    Ok(current_node) => Some((hash_name, MerkleNode::Directory(current_node))),
-                Err(e) => {
+                    Err(e) => {
-                    println!("{}", e);
+                        println!("{}", e);
-                    None
+                        None
+                    }
                 }
             }
+            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");
+                Some((
+                    hash_name,
+                    MerkleNode::Big(crate::BigNode {
+                        children_hashes: bigdir_entries,
+                    }),
+                ))
+            }
+            BIGDIRECTORY => {
+                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"));
+                }
+
+                let current = BigDirectoryNode::new(bigdir_entries);
+                match current {
+                    Ok(current_node) => Some((hash_name, MerkleNode::BigDirectory(current_node))),
+                    Err(e) => {
+                        println!("{}", e);
+                        None
+                    }
+                }
+            }
+            _ => None,
         }
-        _ => None,
     }
 }

client-network/src/lib.rs

@@ -73,7 +73,7 @@ impl P2PSharedData {
 
         let mut threads = Vec::new();
 
-        let senders = MultipleSenders::new(1, &shared_socket, cmd_tx, &mut threads);
+        let senders = MultipleSenders::new(5, &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()));
@@ -196,7 +196,6 @@ pub enum NetworkEvent {
     Disconnected(),
     Error(String, String),
     Success(String, String),
-    PeerConnected(String),
     PeerListUpdated(Vec<(String, bool)>),
     FileTreeReceived([u8; 32], MerkleNode, String), // peer_id, content
     DataReceived([u8; 32], MerkleNode, String),
@@ -577,14 +576,21 @@ pub fn start_p2p_executor(
                                                 current.push(i);
                                             }
                                         }
-                                        let res =
+                                        match event_tx.send(NetworkEvent::PeerListUpdated(peers)) {
-                                            event_tx.send(NetworkEvent::PeerListUpdated(peers));
+                                            Ok(_) => {}
+                                            Err(err) => {
+                                                println!(
+                                                    "Network Event Error : {}",
+                                                    err.to_string()
+                                                );
+                                            }
+                                        };
                                     }
                                     Err(e) => {
                                         eprintln!("invalid UTF-8 in socket address bytes: {}", e);
                                     }
                                 },
-                                Err(e) => println!("error"),
+                                Err(e) => println!("error : {}", e),
                             }
                         }
                     }
@@ -596,25 +602,10 @@ pub fn start_p2p_executor(
                         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.to_owned(), ip, shared_data.as_ref()).await;
                             match peer_address {
                                 Ok(addr) => {
-                                    //if let Some(ping) = pingrequest {
-                                    //    sd.senders_ref().add_message_to_retry_queue(
-                                    //        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 {}.",

client-network/src/message_handling.rs

@@ -370,14 +370,11 @@ pub fn parse_message(
                             // envoyer la root request
                             let _ = &guard.remove_entry(&id);
                             println!("message {} retiré de la liste", id);
-
+                            let new_id = generate_id();
-                            let rootrequest = construct_message(
+                            let rootrequest =
-                                ROOTREQUEST,
+                                construct_message(ROOTREQUEST, Vec::new(), new_id, crypto_pair);
-                                Vec::new(),
+                            let _ = &guard.insert(new_id, EventType::RootRequest);
-                                generate_id(),
+                            println!("root requesst sent");
-                                crypto_pair,
-                            );
-                            //&guard.insert(, v)
                             return rootrequest;
                         }
                         EventType::Hello => {
@@ -392,6 +389,7 @@ pub fn parse_message(
         }
         ROOTREPLY => {
             // recuperer le pseudo du peers ayant repondu
+            println!("root reply received");
             let peers_exist = handhsake_history.get_peer_info_ip(ip.to_string());
             match peers_exist {
                 Some(peerinfo) => {
@@ -429,7 +427,9 @@ pub fn parse_message(
                                     constructed_message = datumreqest;
                                     guard.insert(new_id, EventType::DatumRequest);
                                 }
-                                _ => {}
+                                _ => {
+                                    println!("event not prensent");
+                                }
                             }
                         }
                         None => {}
@@ -468,7 +468,6 @@ pub fn parse_message(
                         }
                     }
                     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]
@@ -481,6 +480,7 @@ pub fn parse_message(
                             parse_received_datum(received_datum.to_vec(), received_length as usize);
                         match parsed_node {
                             Some(tuple) => {
+                                let _ = &guard.remove_entry(&id);
                                 let _ = cmd_tx.send(NetworkEvent::DataReceived(
                                     tuple.0,
                                     tuple.1,
@@ -488,7 +488,9 @@ pub fn parse_message(
                                 ));
                                 println!("datareceived event sent");
                             }
-                            None => {}
+                            None => {
+                                println!("message corrompu, nouvelle tentative");
+                            }
                         }
                     }
                     _ => {}

client-network/src/messages_channels.rs

@@ -234,7 +234,8 @@ pub fn start_retry_thread(
                             );
                             let base: u64 = 2;
 
-                            let backoff = base.saturating_pow(attempt as u32); // 2^1 == 2 seconds
+                            // let backoff = base.saturating_pow(attempt as u32); // 2^1 == 2 seconds
+                            let backoff = 1;
                             let newretry = RetryMessage {
                                 next_try: SystemTime::now()
                                     .duration_since(UNIX_EPOCH)
@@ -272,7 +273,7 @@ pub fn start_receving_thread(
     let messages_received_clone = shared_data.messages_received();
     let servername_clone = shared_data.servername();
     let thread = thread::spawn(move || {
-        let mut buf = [0u8; 1024];
+        let mut buf = [0u8; 1500];
         loop {
             match sock_clone.recv_from(&mut buf) {
                 Ok((amt, src)) => {

client-network/src/registration.rs

@@ -51,6 +51,7 @@ pub fn parse_addresses(input: &String) -> Vec<SocketAddr> {
 ///
 /// registers the IP addresses by sending a Hello request to the server.
 ///
+
 pub async fn perform_handshake(
     sd: &P2PSharedData,
     username: String,
@@ -139,36 +140,3 @@ pub async fn perform_handshake(
     //TODO
     return true;
 }
-
-#[cfg(test)]
-mod tests {
-
-    /*///
-    /// does the procedure to register with the server
-    ///
-    #[tokio::test]
-    async fn registering_with_server() {
-        let username = String::from("gameixtreize");
-        let server_uri = String::from("https://jch.irif.fr:8443");
-        let crypto_pair = CryptographicSignature::new(username);
-        if let Err(e) = register_with_the_server(crypto_pair, server_uri).await {
-            eprintln!("Error during registration: {}", e);
-        }
-    }*/
-
-    /*///
-    /// retreives the socket address of a given peer
-    ///
-    #[tokio::test]
-    async fn retreive_socket_addr() {
-        let username = String::from("ipjkndqfshjldfsjlbsdfjhhj");
-        match get_socket_address(username).await {
-            Ok(body) => {
-                println!("{:?}", body);
-            }
-            Err(e) => {
-                eprintln!("Erreur HTTP: {}", e);
-            }
-        }
-    }*/
-}

rapport.txt

@@ -0,0 +1 @@
+https://docs.google.com/document/d/1emhrAfjJyJTWpBYx4IJGcCz0_iLVjDRAAdq2EZFchKo/edit?usp=sharing