|
|
|
|
@ -1,177 +1,196 @@
|
|
|
|
|
use std::{collections::HashMap, path::PathBuf, string::FromUtf8Error};
|
|
|
|
|
#![allow(unused_imports)]
|
|
|
|
|
|
|
|
|
|
use encoding_rs::Encoding;
|
|
|
|
|
use serde::{Deserialize, Serialize};
|
|
|
|
|
use tauri::{api::ipc::CallbackFn, Manager, Runtime, State, Window};
|
|
|
|
|
|
|
|
|
|
use crate::{
|
|
|
|
|
open::Program,
|
|
|
|
|
process::{CommandEvent, TerminatedPayload},
|
|
|
|
|
scope::ExecuteArgs,
|
|
|
|
|
Shell,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#[allow(dead_code)]
|
|
|
|
|
type ChildId = u32;
|
|
|
|
|
|
|
|
|
|
#[derive(Debug, Clone, Serialize)]
|
|
|
|
|
#[serde(tag = "event", content = "payload")]
|
|
|
|
|
#[non_exhaustive]
|
|
|
|
|
enum JSCommandEvent {
|
|
|
|
|
/// Stderr bytes until a newline (\n) or carriage return (\r) is found.
|
|
|
|
|
Stderr(Buffer),
|
|
|
|
|
/// Stdout bytes until a newline (\n) or carriage return (\r) is found.
|
|
|
|
|
Stdout(Buffer),
|
|
|
|
|
/// An error happened waiting for the command to finish or converting the stdout/stderr bytes to an UTF-8 string.
|
|
|
|
|
Error(String),
|
|
|
|
|
/// Command process terminated.
|
|
|
|
|
Terminated(TerminatedPayload),
|
|
|
|
|
}
|
|
|
|
|
#[cfg(feature = "allow-execute")]
|
|
|
|
|
pub use execute::*;
|
|
|
|
|
|
|
|
|
|
#[cfg(feature = "allow-execute")]
|
|
|
|
|
mod execute {
|
|
|
|
|
use std::{collections::HashMap, path::PathBuf, string::FromUtf8Error};
|
|
|
|
|
|
|
|
|
|
use encoding_rs::Encoding;
|
|
|
|
|
use serde::{Deserialize, Serialize};
|
|
|
|
|
use tauri::{api::ipc::CallbackFn, Manager, Runtime, State, Window};
|
|
|
|
|
|
|
|
|
|
use crate::{
|
|
|
|
|
process::{CommandEvent, TerminatedPayload},
|
|
|
|
|
scope::ExecuteArgs,
|
|
|
|
|
Shell,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
fn get_event_buffer(line: Vec<u8>, encoding: EncodingWrapper) -> Result<Buffer, FromUtf8Error> {
|
|
|
|
|
match encoding {
|
|
|
|
|
EncodingWrapper::Text(character_encoding) => match character_encoding {
|
|
|
|
|
Some(encoding) => Ok(Buffer::Text(
|
|
|
|
|
encoding.decode_with_bom_removal(&line).0.into(),
|
|
|
|
|
)),
|
|
|
|
|
None => String::from_utf8(line).map(Buffer::Text),
|
|
|
|
|
},
|
|
|
|
|
EncodingWrapper::Raw => Ok(Buffer::Raw(line)),
|
|
|
|
|
use super::ChildId;
|
|
|
|
|
|
|
|
|
|
#[derive(Debug, Clone, Serialize)]
|
|
|
|
|
#[serde(tag = "event", content = "payload")]
|
|
|
|
|
#[non_exhaustive]
|
|
|
|
|
enum JSCommandEvent {
|
|
|
|
|
/// Stderr bytes until a newline (\n) or carriage return (\r) is found.
|
|
|
|
|
Stderr(Buffer),
|
|
|
|
|
/// Stdout bytes until a newline (\n) or carriage return (\r) is found.
|
|
|
|
|
Stdout(Buffer),
|
|
|
|
|
/// An error happened waiting for the command to finish or converting the stdout/stderr bytes to an UTF-8 string.
|
|
|
|
|
Error(String),
|
|
|
|
|
/// Command process terminated.
|
|
|
|
|
Terminated(TerminatedPayload),
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl JSCommandEvent {
|
|
|
|
|
pub fn new(event: CommandEvent, encoding: EncodingWrapper) -> Self {
|
|
|
|
|
match event {
|
|
|
|
|
CommandEvent::Terminated(payload) => JSCommandEvent::Terminated(payload),
|
|
|
|
|
CommandEvent::Error(error) => JSCommandEvent::Error(error),
|
|
|
|
|
CommandEvent::Stderr(line) => get_event_buffer(line, encoding)
|
|
|
|
|
.map(JSCommandEvent::Stderr)
|
|
|
|
|
.unwrap_or_else(|e| JSCommandEvent::Error(e.to_string())),
|
|
|
|
|
CommandEvent::Stdout(line) => get_event_buffer(line, encoding)
|
|
|
|
|
.map(JSCommandEvent::Stdout)
|
|
|
|
|
.unwrap_or_else(|e| JSCommandEvent::Error(e.to_string())),
|
|
|
|
|
fn get_event_buffer(line: Vec<u8>, encoding: EncodingWrapper) -> Result<Buffer, FromUtf8Error> {
|
|
|
|
|
match encoding {
|
|
|
|
|
EncodingWrapper::Text(character_encoding) => match character_encoding {
|
|
|
|
|
Some(encoding) => Ok(Buffer::Text(
|
|
|
|
|
encoding.decode_with_bom_removal(&line).0.into(),
|
|
|
|
|
)),
|
|
|
|
|
None => String::from_utf8(line).map(Buffer::Text),
|
|
|
|
|
},
|
|
|
|
|
EncodingWrapper::Raw => Ok(Buffer::Raw(line)),
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[derive(Debug, Clone, Deserialize, Serialize)]
|
|
|
|
|
#[serde(untagged)]
|
|
|
|
|
#[allow(missing_docs)]
|
|
|
|
|
pub enum Buffer {
|
|
|
|
|
Text(String),
|
|
|
|
|
Raw(Vec<u8>),
|
|
|
|
|
}
|
|
|
|
|
impl JSCommandEvent {
|
|
|
|
|
pub fn new(event: CommandEvent, encoding: EncodingWrapper) -> Self {
|
|
|
|
|
match event {
|
|
|
|
|
CommandEvent::Terminated(payload) => JSCommandEvent::Terminated(payload),
|
|
|
|
|
CommandEvent::Error(error) => JSCommandEvent::Error(error),
|
|
|
|
|
CommandEvent::Stderr(line) => get_event_buffer(line, encoding)
|
|
|
|
|
.map(JSCommandEvent::Stderr)
|
|
|
|
|
.unwrap_or_else(|e| JSCommandEvent::Error(e.to_string())),
|
|
|
|
|
CommandEvent::Stdout(line) => get_event_buffer(line, encoding)
|
|
|
|
|
.map(JSCommandEvent::Stdout)
|
|
|
|
|
.unwrap_or_else(|e| JSCommandEvent::Error(e.to_string())),
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[derive(Debug, Copy, Clone)]
|
|
|
|
|
pub enum EncodingWrapper {
|
|
|
|
|
Raw,
|
|
|
|
|
Text(Option<&'static Encoding>),
|
|
|
|
|
}
|
|
|
|
|
#[derive(Debug, Clone, Deserialize, Serialize)]
|
|
|
|
|
#[serde(untagged)]
|
|
|
|
|
#[allow(missing_docs)]
|
|
|
|
|
pub enum Buffer {
|
|
|
|
|
Text(String),
|
|
|
|
|
Raw(Vec<u8>),
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[derive(Debug, Clone, Default, Deserialize)]
|
|
|
|
|
#[serde(rename_all = "camelCase")]
|
|
|
|
|
pub struct CommandOptions {
|
|
|
|
|
#[serde(default)]
|
|
|
|
|
sidecar: bool,
|
|
|
|
|
cwd: Option<PathBuf>,
|
|
|
|
|
// by default we don't add any env variables to the spawned process
|
|
|
|
|
// but the env is an `Option` so when it's `None` we clear the env.
|
|
|
|
|
#[serde(default = "default_env")]
|
|
|
|
|
env: Option<HashMap<String, String>>,
|
|
|
|
|
// Character encoding for stdout/stderr
|
|
|
|
|
encoding: Option<String>,
|
|
|
|
|
}
|
|
|
|
|
#[derive(Debug, Copy, Clone)]
|
|
|
|
|
pub enum EncodingWrapper {
|
|
|
|
|
Raw,
|
|
|
|
|
Text(Option<&'static Encoding>),
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[allow(clippy::unnecessary_wraps)]
|
|
|
|
|
fn default_env() -> Option<HashMap<String, String>> {
|
|
|
|
|
Some(HashMap::default())
|
|
|
|
|
}
|
|
|
|
|
#[derive(Debug, Clone, Default, Deserialize)]
|
|
|
|
|
#[serde(rename_all = "camelCase")]
|
|
|
|
|
pub struct CommandOptions {
|
|
|
|
|
#[serde(default)]
|
|
|
|
|
sidecar: bool,
|
|
|
|
|
cwd: Option<PathBuf>,
|
|
|
|
|
// by default we don't add any env variables to the spawned process
|
|
|
|
|
// but the env is an `Option` so when it's `None` we clear the env.
|
|
|
|
|
#[serde(default = "default_env")]
|
|
|
|
|
env: Option<HashMap<String, String>>,
|
|
|
|
|
// Character encoding for stdout/stderr
|
|
|
|
|
encoding: Option<String>,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[tauri::command]
|
|
|
|
|
pub fn execute<R: Runtime>(
|
|
|
|
|
window: Window<R>,
|
|
|
|
|
shell: State<'_, Shell<R>>,
|
|
|
|
|
program: String,
|
|
|
|
|
args: ExecuteArgs,
|
|
|
|
|
on_event_fn: CallbackFn,
|
|
|
|
|
options: CommandOptions,
|
|
|
|
|
) -> crate::Result<ChildId> {
|
|
|
|
|
let mut command = if options.sidecar {
|
|
|
|
|
let program = PathBuf::from(program);
|
|
|
|
|
let program_as_string = program.display().to_string();
|
|
|
|
|
let program_no_ext_as_string = program.with_extension("").display().to_string();
|
|
|
|
|
let configured_sidecar = window
|
|
|
|
|
.config()
|
|
|
|
|
.tauri
|
|
|
|
|
.bundle
|
|
|
|
|
.external_bin
|
|
|
|
|
.as_ref()
|
|
|
|
|
.and_then(|bins| {
|
|
|
|
|
bins.iter()
|
|
|
|
|
.find(|b| b == &&program_as_string || b == &&program_no_ext_as_string)
|
|
|
|
|
})
|
|
|
|
|
.cloned();
|
|
|
|
|
if let Some(sidecar) = configured_sidecar {
|
|
|
|
|
shell
|
|
|
|
|
.scope
|
|
|
|
|
.prepare_sidecar(&program.to_string_lossy(), &sidecar, args)?
|
|
|
|
|
#[allow(clippy::unnecessary_wraps)]
|
|
|
|
|
fn default_env() -> Option<HashMap<String, String>> {
|
|
|
|
|
Some(HashMap::default())
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[tauri::command]
|
|
|
|
|
pub fn execute<R: Runtime>(
|
|
|
|
|
window: Window<R>,
|
|
|
|
|
shell: State<'_, Shell<R>>,
|
|
|
|
|
program: String,
|
|
|
|
|
args: ExecuteArgs,
|
|
|
|
|
on_event_fn: CallbackFn,
|
|
|
|
|
options: CommandOptions,
|
|
|
|
|
) -> crate::Result<ChildId> {
|
|
|
|
|
let mut command = if options.sidecar {
|
|
|
|
|
let program = PathBuf::from(program);
|
|
|
|
|
let program_as_string = program.display().to_string();
|
|
|
|
|
let program_no_ext_as_string = program.with_extension("").display().to_string();
|
|
|
|
|
let configured_sidecar = window
|
|
|
|
|
.config()
|
|
|
|
|
.tauri
|
|
|
|
|
.bundle
|
|
|
|
|
.external_bin
|
|
|
|
|
.as_ref()
|
|
|
|
|
.and_then(|bins| {
|
|
|
|
|
bins.iter()
|
|
|
|
|
.find(|b| b == &&program_as_string || b == &&program_no_ext_as_string)
|
|
|
|
|
})
|
|
|
|
|
.cloned();
|
|
|
|
|
if let Some(sidecar) = configured_sidecar {
|
|
|
|
|
shell
|
|
|
|
|
.scope
|
|
|
|
|
.prepare_sidecar(&program.to_string_lossy(), &sidecar, args)?
|
|
|
|
|
} else {
|
|
|
|
|
return Err(crate::Error::SidecarNotAllowed(program));
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
return Err(crate::Error::SidecarNotAllowed(program));
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
match shell.scope.prepare(&program, args) {
|
|
|
|
|
Ok(cmd) => cmd,
|
|
|
|
|
Err(e) => {
|
|
|
|
|
#[cfg(debug_assertions)]
|
|
|
|
|
eprintln!("{e}");
|
|
|
|
|
return Err(crate::Error::ProgramNotAllowed(PathBuf::from(program)));
|
|
|
|
|
match shell.scope.prepare(&program, args) {
|
|
|
|
|
Ok(cmd) => cmd,
|
|
|
|
|
Err(e) => {
|
|
|
|
|
#[cfg(debug_assertions)]
|
|
|
|
|
eprintln!("{e}");
|
|
|
|
|
return Err(crate::Error::ProgramNotAllowed(PathBuf::from(program)));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
if let Some(cwd) = options.cwd {
|
|
|
|
|
command = command.current_dir(cwd);
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
if let Some(cwd) = options.cwd {
|
|
|
|
|
command = command.current_dir(cwd);
|
|
|
|
|
}
|
|
|
|
|
if let Some(env) = options.env {
|
|
|
|
|
command = command.envs(env);
|
|
|
|
|
} else {
|
|
|
|
|
command = command.env_clear();
|
|
|
|
|
}
|
|
|
|
|
let encoding = match options.encoding {
|
|
|
|
|
Option::None => EncodingWrapper::Text(None),
|
|
|
|
|
Some(encoding) => match encoding.as_str() {
|
|
|
|
|
"raw" => EncodingWrapper::Raw,
|
|
|
|
|
_ => {
|
|
|
|
|
if let Some(text_encoding) = Encoding::for_label(encoding.as_bytes()) {
|
|
|
|
|
EncodingWrapper::Text(Some(text_encoding))
|
|
|
|
|
} else {
|
|
|
|
|
return Err(crate::Error::UnknownEncoding(encoding));
|
|
|
|
|
if let Some(env) = options.env {
|
|
|
|
|
command = command.envs(env);
|
|
|
|
|
} else {
|
|
|
|
|
command = command.env_clear();
|
|
|
|
|
}
|
|
|
|
|
let encoding = match options.encoding {
|
|
|
|
|
Option::None => EncodingWrapper::Text(None),
|
|
|
|
|
Some(encoding) => match encoding.as_str() {
|
|
|
|
|
"raw" => EncodingWrapper::Raw,
|
|
|
|
|
_ => {
|
|
|
|
|
if let Some(text_encoding) = Encoding::for_label(encoding.as_bytes()) {
|
|
|
|
|
EncodingWrapper::Text(Some(text_encoding))
|
|
|
|
|
} else {
|
|
|
|
|
return Err(crate::Error::UnknownEncoding(encoding));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let (mut rx, child) = command.spawn()?;
|
|
|
|
|
let (mut rx, child) = command.spawn()?;
|
|
|
|
|
|
|
|
|
|
let pid = child.pid();
|
|
|
|
|
shell.children.lock().unwrap().insert(pid, child);
|
|
|
|
|
let children = shell.children.clone();
|
|
|
|
|
let pid = child.pid();
|
|
|
|
|
shell.children.lock().unwrap().insert(pid, child);
|
|
|
|
|
let children = shell.children.clone();
|
|
|
|
|
|
|
|
|
|
tauri::async_runtime::spawn(async move {
|
|
|
|
|
while let Some(event) = rx.recv().await {
|
|
|
|
|
if matches!(event, crate::process::CommandEvent::Terminated(_)) {
|
|
|
|
|
children.lock().unwrap().remove(&pid);
|
|
|
|
|
};
|
|
|
|
|
let js_event = JSCommandEvent::new(event, encoding);
|
|
|
|
|
let js = tauri::api::ipc::format_callback(on_event_fn, &js_event)
|
|
|
|
|
.expect("unable to serialize CommandEvent");
|
|
|
|
|
tauri::async_runtime::spawn(async move {
|
|
|
|
|
while let Some(event) = rx.recv().await {
|
|
|
|
|
if matches!(event, crate::process::CommandEvent::Terminated(_)) {
|
|
|
|
|
children.lock().unwrap().remove(&pid);
|
|
|
|
|
};
|
|
|
|
|
let js_event = JSCommandEvent::new(event, encoding);
|
|
|
|
|
let js = tauri::api::ipc::format_callback(on_event_fn, &js_event)
|
|
|
|
|
.expect("unable to serialize CommandEvent");
|
|
|
|
|
|
|
|
|
|
let _ = window.eval(js.as_str());
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
let _ = window.eval(js.as_str());
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
Ok(pid)
|
|
|
|
|
Ok(pid)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[cfg(feature = "allow-stdin-write")]
|
|
|
|
|
#[tauri::command]
|
|
|
|
|
pub fn stdin_write<R: Runtime>(
|
|
|
|
|
_window: Window<R>,
|
|
|
|
|
@ -188,6 +207,7 @@ pub fn stdin_write<R: Runtime>(
|
|
|
|
|
Ok(())
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[cfg(feature = "allow-kill")]
|
|
|
|
|
#[tauri::command]
|
|
|
|
|
pub fn kill<R: Runtime>(
|
|
|
|
|
_window: Window<R>,
|
|
|
|
|
@ -200,6 +220,7 @@ pub fn kill<R: Runtime>(
|
|
|
|
|
Ok(())
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[cfg(feature = "allow-open")]
|
|
|
|
|
#[tauri::command]
|
|
|
|
|
pub fn open<R: Runtime>(
|
|
|
|
|
_window: Window<R>,
|
|
|
|
|
|
Lucas Nogueira
2 years ago