opeolluwa · opeolluwa · May 21, 2024 · May 20, 2024 · May 21, 2024 · May 21, 2024
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -137,3 +137,6 @@ filesync
 
 */target 
 
+
+target
+Cargo.lock
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,3 +0,0 @@
-{
-  "recommendations": ["tauri-apps.tauri-vscode", "rust-lang.rust-analyzer"]
-}

diff --git a/Cargo.toml b/Cargo.toml
@@ -0,0 +1,2 @@
+[workspace]
+members = ["./desktop/core"]
diff --git a/desktop/core/Cargo.toml b/desktop/core/Cargo.toml
@@ -40,7 +40,7 @@ sysinfo = "0.29.2"
 tauri = {version = "1.2", features = [ "clipboard-write-text", "window-all", "app-all", "dialog-all", "fs-all", "path-all", "shell-open"] }
 tokio = {version = "1.26.0", features = ["full"] }
 tokio-util = {version = "0.7", features = ["io"] }
-tower = {version = "0.4", features = ["util"] }
+tower = {version = "0.4", features = [ "util"] }
 tower-http = {version = "0.4.0", features = ["fs", "trace", "cors"] }
 tracing = "0.1.37"
 tracing-subscriber = {version = "0.3.16", features = ["env-filter"] }
@@ -57,7 +57,9 @@ wifidirect-legacy-ap = "0.4.0"
 aes-gcm = "0.10.3"
 sha2 = "0.10.8"
 rand = "0.8.5"
+tokio-stream = "0.1"
 [features]
 # this feature is used for production builds or when `devPath` points to the filesystem
 # DO NOT REMOVE!!
 custom-protocol = ["tauri/custom-protocol"]
+
diff --git a/desktop/core/src/assets/index.html b/desktop/core/src/assets/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Document</title>
+</head>
+<body>
+    Lorem ipsum dolor sit amet consectetur adipisicing elit. Inventore ratione amet odio ullam doloremque consequuntur quaerat pariatur non omnis expedita, adipisci rem. Reiciendis corporis deserunt delectus doloremque eveniet, explicabo voluptatem.
+</body>
+</html>
diff --git a/desktop/core/src/file_manager/file.rs b/desktop/core/src/file_manager/file.rs
@@ -7,9 +7,6 @@ use walkdir::DirEntry;
 extern crate dirs;
 use path_absolutize::*;
 
-
-
-
 /// a function to compute file size
 /// accept files size in byte and parse it to human readable KB, MB, TB, GB e.t.
 pub fn compute_file_size(size: u128) -> String {
@@ -26,8 +23,6 @@ pub fn compute_file_size(size: u128) -> String {
     }
 }
 
-
-
 #[derive(serde::Serialize, Debug)]
 pub struct DriveInformation {
     name: String,
@@ -44,7 +39,6 @@ pub struct Drives {
     array_of_drives: Vec<DriveInformation>,
 }
 
-
 // the file structure
 #[derive(Debug, Default, Serialize, Deserialize, TS)]
 #[serde(rename_all = "camelCase")]

diff --git a/desktop/core/src/file_manager/mod.rs b/desktop/core/src/file_manager/mod.rs
@@ -1,7 +1,5 @@
 pub mod file;
 
-use std::net::Ipv4Addr;
-use std::path::PathBuf;
 use crate::UPLOAD_PATH;
 use crate::{
     file_manager::file::{get_files_in_directory, File},
@@ -10,6 +8,8 @@ use crate::{
 use dirs;
 use serde::{Deserialize, Serialize};
 use serde_json::{json, Value};
+use std::net::Ipv4Addr;
+use std::path::PathBuf;
 use ts_rs::TS;
 
 use crate::database::{self, TransferHistory, TransferHistoryBuilder};

diff --git a/desktop/core/src/ipc_manager/mod.rs b/desktop/core/src/ipc_manager/mod.rs
@@ -1,4 +1,3 @@
-
 pub mod settings;
 pub mod utils;
 pub mod wifi;
diff --git a/desktop/core/src/main.rs b/desktop/core/src/main.rs
@@ -2,14 +2,14 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
 extern crate uptime_lib;
+use crate::file_manager::get_transfer_history;
 use crate::file_manager::read_dir;
 use crate::ipc_manager::settings::{get_application_data, get_settings, update_settings};
 use crate::ipc_manager::utils::{
     generate_qr_code, get_ip_address, get_system_information, is_connected_to_wifi,
 };
 use lazy_static::lazy_static;
 use server::http_server;
-use crate::file_manager::get_transfer_history;
 mod database;
 mod file_manager;
 mod ipc_manager;

diff --git a/desktop/core/src/network_manager/linux.rs b/desktop/core/src/network_manager/linux.rs
@@ -0,0 +1,25 @@
+
+
+use super::WifiHotspotConfig;
+use super::WifiHotspotConfigBuilder;
+impl WifiHotspotConfigBuilder for  WifiHotspotConfig {
+   fn create() -> Self {
+        todo!()
+    }
+
+   fn connect() -> crate::utils::CommandData<bool> {
+        todo!()
+    }
+
+    fn scan() -> Vec<String> {
+        todo!()
+    }
+
+    fn stop() -> () {
+        todo!()
+    }
+
+    fn refresh() -> () {
+        todo!()
+    }
+}
diff --git a/desktop/core/src/network_manager/mac.rs b/desktop/core/src/network_manager/mac.rs
@@ -0,0 +1,25 @@
+
+use super::WifiHotspotConfig;
+use super::WifiHotspotConfigBuilder;
+
+impl WifiHotspotConfigBuilder for  WifiHotspotConfig {
+   fn create() -> Self {
+        todo!()
+    }
+
+   fn connect() -> crate::utils::CommandData<bool> {
+        todo!()
+    }
+
+    fn scan() -> Vec<String> {
+        todo!()
+    }
+
+    fn stop() -> () {
+        todo!()
+    }
+
+    fn refresh() -> () {
+        todo!()
+    }
+}
diff --git a/desktop/core/src/network_manager/mod.rs b/desktop/core/src/network_manager/mod.rs
@@ -1,14 +1,30 @@
 #[allow(unused)]
-
 use std::fmt;
 
-use crate::utils::system_info::SystemInformation;
-use nanoid::nanoid;
 use serde::{Deserialize, Serialize};
+use crate::utils::CommandData;
 
-///TODO: use conditional import
-// pub mod hotspot;
 pub mod ip_manager;
+
+#[cfg_attr(target_os = "linux", path = "linux.rs")]
+#[cfg_attr(target_os = "macos", path = "mac.rs")]
+#[cfg_attr(target_os = "windows", path = "windows.rs")]
+pub mod network;
+
+
+/// the Network config trait to be implemented independently fi=or windows, mac and linux
+pub trait WifiHotspotConfigBuilder {
+    /// create new hotspot 
+ fn create() -> Self;
+ /// connect to a wifi
+ fn connect() -> CommandData<bool>;
+/// scan for network, return an array of network names / ssid
+fn scan() -> Vec<String>;
+/// terminate the wifi hot spot 
+fn stop() -> ();
+/// refresh  the network hotspot or wifi 
+fn refresh() -> ();
+}
 // pub mod network_scanner;
 /// the network interface type contains the
 /// - gateway ex 192.168.0.0.1
@@ -17,18 +33,18 @@ pub mod ip_manager;
 /// - (optional) QR code to scan to connect
 /// - (optional) the network card frequency, e.g 2.4GHz or 5Ghz
 /// it will be used to communicate with the application interface
-#[derive(Debug, Serialize, Deserialize, Default)]
+#[derive(Debug, Serialize, Deserialize)]
 pub struct WifiHotspotConfig {
-    /// the network broadcast ip address
+    /// the network broadcast ip address eg 192.16.8.0.1
     gateway: String,
-    /// the network name (generates)
+    /// the network name (generated)
     ssid: String,
     /// the network password
     password: String,
     /// the status of the network
-    status: Option<NetworkAccessStatus>,
-    /// message
-    message: Option<String>,
+    status: NetworkAccessStatus,
+    /// success or error message
+    message: String,
 }
 
 /// network was successfully created or there is an error
@@ -38,53 +54,7 @@ pub enum NetworkAccessStatus {
     Error,
 }
 
-#[allow(unused)]
-
-impl WifiHotspotConfig {
-
-    pub fn new(gateway: &str) -> Self {
-        let SystemInformation {
-            system_name: ssid, ..
-        } = SystemInformation::new(); // use the system name
-        let password = nanoid!(8); // generate username and password
-        let gateway = gateway.to_string();
-
-        Self {
-            gateway,
-            ssid,
-            password,
-            ..Default::default()
-        }
-    }
-
-    #[allow(dead_code)]
-    pub fn ok(gateway: &str) -> Self {
-        let SystemInformation {
-            system_name: ssid, ..
-        } = SystemInformation::new(); // use the system name
-        let password = nanoid!(8); // generate username and password
-        let gateway = gateway.to_string();
-        let message = Some(String::from("Wifi hotspot created successfully"));
-
-        Self {
-            gateway,
-            ssid,
-            password,
-            status: Some(NetworkAccessStatus::Created),
-            message,
-        }
-    }
-
-    pub fn err() -> Self {
-        let message = Some(String::from("Failed to create Wifi hotspot"));
-
-        Self {
-            status: Some(NetworkAccessStatus::Created),
-            message,
-            ..Default::default()
-        }
-    }
-}
+impl WifiHotspotConfig {}
 
 impl fmt::Display for WifiHotspotConfig {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

diff --git a/desktop/core/src/network_manager/windows.rs b/desktop/core/src/network_manager/windows.rs
@@ -0,0 +1,26 @@
+
+
+use super::WifiHotspotConfig;
+use super::WifiHotspotConfigBuilder;
+
+impl WifiHotspotConfigBuilder for  WifiHotspotConfig {
+   fn create() -> Self {
+        todo!()
+    }
+
+   fn connect() -> crate::utils::CommandData<bool> {
+        todo!()
+    }
+
+    fn scan() -> Vec<String> {
+        todo!()
+    }
+
+    fn stop() -> () {
+        todo!()
+    }
+
+    fn refresh() -> () {
+        todo!()
+    }
+}
diff --git a/desktop/core/src/server/http_server.rs b/desktop/core/src/server/http_server.rs
@@ -1,7 +1,10 @@
+use std::path::PathBuf;
+
 use reqwest::Method;
 
 use tower_http::cors::Any;
 use tower_http::cors::CorsLayer;
+use tower_http::services::ServeDir;
 use tracing_subscriber::prelude::__tracing_subscriber_SubscriberExt;
 use tracing_subscriber::util::SubscriberInitExt;
 
@@ -11,6 +14,7 @@ use crate::database::Database;
 use crate::server::router;
 
 use crate::server::routes::handle_404;
+use crate::server::routes::notify_peer;
 use crate::SERVER_PORT;
 
 /**
@@ -55,13 +59,25 @@ pub async fn core_server() {
 
     println!(" the server port is http://{}", ip_address);
 
+
+        let assets_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("assets");
+
+    let static_files_service = ServeDir::new(assets_dir).append_index_html_on_directories(true);
+
+
     // build our application with the required routes
     let app = router::app()
+      .fallback_service(static_files_service)
         .layer(file_limit)
         .layer(cors_layer)
         .layer(tower_http::trace::TraceLayer::new_for_http())
-        .fallback(handle_404);
+        ;
 
+        // build our application with a route
+    // let app = axum::Router::new()
+    //     .fallback_service(static_files_service)
+    //     .route("/sse", axum::routing::get(notify_peer))
+    //     .layer(tower_http::trace::TraceLayer::new_for_http());
     // run the server
     axum::Server::bind(&ip_address)
         .serve(app.into_make_service())

diff --git a/desktop/core/src/server/router.rs b/desktop/core/src/server/router.rs
@@ -6,17 +6,18 @@ use axum::{
 };
 
 use super::routes::{
-    accept_file_upload, download_file, file_upload_form, get_file, health_check, ping_server,
-    system_information,
+    accept_file_upload, download_file, file_upload_form, get_file, health_check, notify_peer,
+    ping_server, system_information,
 };
 
 // the app is moved here to allow sharing across test modules
 pub fn app() -> Router {
     Router::new()
-        .route("/", get(ping_server))
+        // .route("/", get(ping_server))
         .route("/upload", post(accept_file_upload).get(file_upload_form))
         .route("/health", post(accept_file_upload).get(health_check))
         .route("/api/sys-info", get(system_information))
         .route("/api/download", get(download_file))
         .route("/api/file", get(get_file))
+        .route("/notify", get(notify_peer))
 }