feat: command execution & tauri comunication

Author: keiner5212

src-tauri/Cargo.lock

@@ -1,5 +1,5 @@
 [package]
-name = "hello-node"
+name = "hello_node"
 version = "0.0.0"
 description = "A Tauri App"
 authors = ["you"]
@@ -11,6 +11,7 @@ edition = "2021"
 tauri-build = { version = "1", features = [] }
 
 [dependencies]
+lazy_static = "1.4"
 tauri = { version = "1", features = [ "system-tray", "dialog-message", "shell-open"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"

src-tauri/Cargo.toml

@@ -1,21 +1,48 @@
 // Prevents additional console window on Windows in release, DO NOT REMOVE!!
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
+mod system_utils;
+
+use lazy_static::lazy_static;
+use tauri::Window;
 use tauri::{CustomMenuItem, Manager, SystemTray, SystemTrayEvent, SystemTrayMenu};
 use tauri_plugin_autostart::MacosLauncher;
+use system_utils::executor::run_command_with_logging;
+
+// create a mutex to store the main window
+lazy_static! {
+    static ref MAIN_WINDOW: std::sync::Mutex<Option<Window>> = std::sync::Mutex::new(None);
+}
 
-// Learn more about Tauri commands at https://tauri.app/v1/guides/features/command
+fn logger(message: String, js_function: String) {
+    if let Ok(window) = MAIN_WINDOW.lock() {
+        if let Some(win) = &*window {
+            let js_code = format!("{}('{}');", js_function, message);
+            win.eval(&js_code).unwrap();
+        }
+    }
+}
+#[allow(non_snake_case)]
 #[tauri::command]
-fn greet(name: &str) -> String {
-    format!("Hello, {}! You've been greeted from Rust!", name)
+fn executeEcho(){
+    match run_command_with_logging("echo", &["hello"], logger) {
+        Ok(_) => println!("Command executed successfully"),
+        Err(e) => println!("Failed to execute command: {}", e),
+    }
 }
 
+
 fn main() {
     // creating a menu for the system tray, with a quit option (add more options later if needed)
     let quit = CustomMenuItem::new("quit".to_string(), "Quit").accelerator("Cmd+Q");
-    
+
     let system_tray_menu = SystemTrayMenu::new().add_item(quit);
     tauri::Builder::default()
+        .setup(|app| {
+            let main_window = app.get_window("main").unwrap();
+            *MAIN_WINDOW.lock().unwrap() = Some(main_window);
+            Ok(())
+        })
         .plugin(tauri_plugin_autostart::init(
             MacosLauncher::LaunchAgent,
             Some(vec![]),
@@ -51,7 +78,7 @@ fn main() {
             },
             _ => {}
         })
-        .invoke_handler(tauri::generate_handler![greet])
+        .invoke_handler(tauri::generate_handler![executeEcho])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
 }

src-tauri/src/main.rs

@@ -0,0 +1,63 @@
+use std::io::{BufRead, BufReader};
+use std::process::{Command, Stdio};
+use std::sync::mpsc::{self};
+use std::thread;
+
+pub type Logger = fn(String, String);
+
+// run a command and log the output
+pub fn run_command_with_logging(
+    command: &str,
+    args: &[&str],
+    logger: Logger,
+) -> std::io::Result<()> {
+    println!("executing {} {}", command, args.join(" "));
+
+    let shell = if cfg!(windows) { "cmd" } else { "sh" };
+
+    let command_to_execute = format!("{} {}", command, args.join(" "));
+
+    let arg = if cfg!(windows) {
+        &["/C", command_to_execute.as_str()]
+    } else {
+        &["-c", command_to_execute.as_str()]
+    };
+
+    let mut cmd = Command::new(shell)
+        .args(arg)
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped())
+        .spawn()?;
+
+    let stdout = cmd.stdout.take().expect("Failed to open stdout");
+    let stderr = cmd.stderr.take().expect("Failed to open stderr");
+
+    let (tx, rx) = mpsc::channel();
+
+    let tx_clone = tx.clone();
+    thread::spawn(move || {
+        let reader = BufReader::new(stdout);
+        for line in reader.lines() {
+            if let Ok(line) = line {
+                tx_clone.send(line).unwrap();
+            }
+        }
+    });
+
+    thread::spawn(move || {
+        let reader = BufReader::new(stderr);
+        for line in reader.lines() {
+            if let Ok(line) = line {
+                tx.send(line).unwrap();
+            }
+        }
+    });
+
+    for line in rx {
+        println!("{}", line);
+        logger(line, "FunctionOutputLogger".to_string());
+    }
+
+    cmd.wait()?;
+    Ok(())
+}

src-tauri/src/system_utils/executor.rs

@@ -0,0 +1 @@
+pub mod executor;

src-tauri/src/system_utils/mod.rs

@@ -4,19 +4,17 @@ import { enable, isEnabled, disable } from "tauri-plugin-autostart-api";
 import "./App.css";
 
 function App() {
-	const [greetMsg, setGreetMsg] = useState("");
-	const [name, setName] = useState("");
 	const [enabled, setEnabled] = useState(false);
 
 	async function greet() {
-		setGreetMsg(await invoke("greet", { name }));
+		await invoke("executeEcho");
 	}
 
 	useEffect(() => {
 		isEnabled().then((e) => {
 			if (e) {
 				setEnabled(true);
-			} 
+			}
 		});
 	}, []);
 
@@ -32,26 +30,16 @@ function App() {
 		}
 	}
 
+	window.FunctionOutputLogger = function (msg: string) {
+		console.log(msg);
+	};
+
 	return (
 		<div className="container">
-			<form
-				className="row"
-				onSubmit={(e) => {
-					e.preventDefault();
-					greet();
-				}}
-			>
-				<input
-					id="greet-input"
-					onChange={(e) => setName(e.currentTarget.value)}
-					placeholder="Enter a name..."
-				/>
-				<button type="submit">Greet</button>
-			</form>
-
-			<button onClick={switchAutostart}>{enabled ? "Disable autostart" : "Enable autostart"}</button>
-
-			<p>{greetMsg}</p>
+			<button onClick={switchAutostart}>
+				{enabled ? "Disable autostart" : "Enable autostart"}
+			</button>
+			<button onClick={greet}>test</button>
 		</div>
 	);
 }

src/App.tsx

@@ -0,0 +1,4 @@
+
+interface Window {
+    FunctionOutputLogger: (message: string) => void;
+  }