Added More Workspace Stability

Author: alvinosh

Cargo.toml

@@ -19,3 +19,6 @@ rand = "0.8.5"
 tokio = { version = "1.37.0", features = ["full"] }
 tokio-util = "0.7.11"
 bytes = "1.6.0"
+
+[profile.dev]
+opt-level = 1

core/Cargo.toml

@@ -16,12 +16,13 @@ thiserror = { workspace = true }
 futures-buffered = { workspace = true }
 futures-lite = { workspace = true }
 serde = { workspace = true }
+rand.workspace = true
+tokio.workspace = true
+
 postcard = "1.0.8"
 uniffi = { version = "0.28.0" }
-rand.workspace = true
 data-encoding = "2.6.0"
 async-channel = "2.3.1"
-tokio.workspace = true
 tracing-subscriber = "0.3.19"
 
 [build-dependencies]

src-tauri/Cargo.toml

@@ -17,22 +17,23 @@ crate-type = ["staticlib", "cdylib", "rlib"]
 tauri-build = { version = "2", features = [] }
 
 [dependencies]
-drop_core = { path = "../core" }
 tauri = { version = "2", features = [] }
 dirs = "5.0.1"
 open = "5.1.3"
+tauri-plugin-dialog = "2"
+tauri-plugin-opener = "2"
+tauri-plugin-clipboard-manager = "2.0.0-alpha.2"
+
+drop_core = { path = "../core" }
 
 iroh-blobs = { workspace = true }
 iroh-base = { workspace = true }
 anyhow = { workspace = true }
 
 tokio = { workspace = true, features = ["full"] }
-tauri-plugin-dialog = "2"
-tauri-plugin-opener = "2"
-tauri-plugin-clipboard-manager = "2.0.0-alpha.2"
 
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
+serde_json = { workspace = true }
+serde = { workspace = true }
 
 [features]
 # this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled.

src-tauri/src/lib.rs

@@ -125,32 +125,30 @@ async fn receive_files(
 ) -> Result<String, InvokeError> {
     let async_proc_input_tx = state.inner.lock().await.clone();
 
-    let mut handles = Vec::new();
+    let (tx, mut rx) = tokio::sync::mpsc::channel::<Vec<FileTransfer>>(2);
 
-    let (tx, rx) = std::sync::mpsc::channel::<Vec<FileTransfer>>();
-
-    handles.push(tokio::spawn(async move {
+    let handle = tokio::spawn(async move {
         loop {
-            let files = rx.recv();
-            if let Ok(files) = files {
+            let files = rx.recv().await;
+            if let Some(files) = files {
                 let _ = async_proc_input_tx.send(Event::Files(files)).await;
             } else {
                 break;
             }
         }
-    }));
+    });
+
+    let outpath = dirs::download_dir().expect("No Downloads Dir");
 
-    // let files = IrohInstance::receive_files(ticket, tx)
-    //     .await
-    //     .map_err(|e| InvokeError::from_anyhow(anyhow!(e)))?;
+    let files = IrohInstance::receive_files(ticket, tx)
+        .await
+        .map_err(|e| InvokeError::from_anyhow(anyhow!(e)))?;
 
-    // println!("files: {:?}", files);
+    println!("files: {:?}", files);
 
-    for handle in handles {
-        handle.await.unwrap();
-    }
+    handle.await.unwrap();
 
-    Ok("[TEST]".into())
+    Ok(outpath.to_str().unwrap().to_owned())
 }
 
 #[tauri::command]

src/routes/transfers/transferring/+page.svelte

@@ -19,12 +19,17 @@
 	let transferFiles: FileTransferDTO[] = [];
 
 	onMount(async () => {
-		let start = Date.now();
-		output = await invoke('receive_files', {
-			ticket: data.ticket
-		});
-		time_complete = Date.now() - start;
-		done = true;
+		try {
+			let start = Date.now();
+			output = await invoke('receive_files', {
+				ticket: data.ticket
+			});
+			time_complete = Date.now() - start;
+			done = true;
+		} catch (error) {
+			console.error("ERROR:", error)
+		}
+
 	});
 
 	listen('download_progress', (event) => {