mirror of
https://github.com/nushell/nushell.git
synced 2025-02-18 03:21:05 +01:00
# Description Adds support for running plugins using local socket communication instead of stdio. This will be an optional thing that not all plugins have to support. This frees up stdio for use to make plugins that use stdio to create terminal UIs, cc @amtoine, @fdncred. This uses the [`interprocess`](https://crates.io/crates/interprocess) crate (298 stars, MIT license, actively maintained), which seems to be the best option for cross-platform local socket support in Rust. On Windows, a local socket name is provided. On Unixes, it's a path. The socket name is kept to a relatively small size because some operating systems have pretty strict limits on the whole path (~100 chars), so on macOS for example we prefer `/tmp/nu.{pid}.{hash64}.sock` where the hash includes the plugin filename and timestamp to be unique enough. This also adds an API for moving plugins in and out of the foreground group, which is relevant for Unixes where direct terminal control depends on that. TODO: - [x] Generate local socket path according to OS conventions - [x] Add support for passing `--local-socket` to the plugin executable instead of `--stdio`, and communicating over that instead - [x] Test plugins that were broken, including [amtoine/nu_plugin_explore](https://github.com/amtoine/nu_plugin_explore) - [x] Automatically upgrade to using local sockets when supported, falling back if it doesn't work, transparently to the user without any visible error messages - Added protocol feature: `LocalSocket` - [x] Reset preferred mode to `None` on `register` - [x] Allow plugins to detect whether they're running on a local socket and can use stdio freely, so that TUI plugins can just produce an error message otherwise - Implemented via `EngineInterface::is_using_stdio()` - [x] Clean up foreground state when plugin command exits on the engine side too, not just whole plugin - [x] Make sure tests for failure cases work as intended - `nu_plugin_stress_internals` added # User-Facing Changes - TUI plugins work - Non-Rust plugins could optionally choose to use this - This might behave differently, so will need to test it carefully across different operating systems # Tests + Formatting - 🟢 `toolkit fmt` - 🟢 `toolkit clippy` - 🟢 `toolkit test` - 🟢 `toolkit test stdlib` # After Submitting - [ ] Document local socket option in plugin contrib docs - [ ] Document how to do a terminal UI plugin in plugin contrib docs - [ ] Document: `EnterForeground` engine call - [ ] Document: `LeaveForeground` engine call - [ ] Document: `LocalSocket` protocol feature
433 lines
13 KiB
Rust
433 lines
13 KiB
Rust
/// Run a command in nu and get its output
|
|
///
|
|
/// The `nu!` macro accepts a number of options like the `cwd` in which the
|
|
/// command should be run. It is also possible to specify a different `locale`
|
|
/// to test locale dependent commands.
|
|
///
|
|
/// Pass options as the first arguments in the form of `key_1: value_1, key_1:
|
|
/// value_2, ...`. The options are defined in the `NuOpts` struct inside the
|
|
/// `nu!` macro.
|
|
///
|
|
/// The command can be formatted using `{}` just like `println!` or `format!`.
|
|
/// Pass the format arguments comma separated after the command itself.
|
|
///
|
|
/// # Examples
|
|
///
|
|
/// ```no_run
|
|
/// # // NOTE: The `nu!` macro needs the `nu` binary to exist. The test are
|
|
/// # // therefore only compiled but not run (that's what the `no_run` at
|
|
/// # // the beginning of this code block is for).
|
|
/// #
|
|
/// use nu_test_support::nu;
|
|
///
|
|
/// let outcome = nu!(
|
|
/// "date now | date to-record | get year"
|
|
/// );
|
|
///
|
|
/// let dir = "/";
|
|
/// let outcome = nu!(
|
|
/// "ls {} | get name",
|
|
/// dir,
|
|
/// );
|
|
///
|
|
/// let outcome = nu!(
|
|
/// cwd: "/",
|
|
/// "ls | get name",
|
|
/// );
|
|
///
|
|
/// let cell = "size";
|
|
/// let outcome = nu!(
|
|
/// locale: "de_DE.UTF-8",
|
|
/// "ls | into int {}",
|
|
/// cell,
|
|
/// );
|
|
///
|
|
/// let decimals = 2;
|
|
/// let outcome = nu!(
|
|
/// locale: "de_DE.UTF-8",
|
|
/// "10 | into string --decimals {}",
|
|
/// decimals,
|
|
/// );
|
|
/// ```
|
|
#[macro_export]
|
|
macro_rules! nu {
|
|
// In the `@options` phase, we restucture all the
|
|
// `$field_1: $value_1, $field_2: $value_2, ...`
|
|
// pairs to a structure like
|
|
// `@options[ $field_1 => $value_1 ; $field_2 => $value_2 ; ... ]`.
|
|
// We do this to later distinguish the options from the `$path` and `$part`s.
|
|
// (See
|
|
// https://users.rust-lang.org/t/i-dont-think-this-local-ambiguity-when-calling-macro-is-ambiguous/79401?u=x3ro
|
|
// )
|
|
//
|
|
// If there is any special treatment needed for the `$value`, we can just
|
|
// match for the specific `field` name.
|
|
(
|
|
@options [ $($options:tt)* ]
|
|
cwd: $value:expr,
|
|
$($rest:tt)*
|
|
) => {
|
|
nu!(@options [ $($options)* cwd => $crate::fs::in_directory($value) ; ] $($rest)*)
|
|
};
|
|
// For all other options, we call `.into()` on the `$value` and hope for the best. ;)
|
|
(
|
|
@options [ $($options:tt)* ]
|
|
$field:ident : $value:expr,
|
|
$($rest:tt)*
|
|
) => {
|
|
nu!(@options [ $($options)* $field => $value.into() ; ] $($rest)*)
|
|
};
|
|
|
|
// When the `$field: $value,` pairs are all parsed, the next tokens are the `$path` and any
|
|
// number of `$part`s, potentially followed by a trailing comma.
|
|
(
|
|
@options [ $($options:tt)* ]
|
|
$path:expr
|
|
$(, $part:expr)*
|
|
$(,)*
|
|
) => {{
|
|
// Here we parse the options into a `NuOpts` struct
|
|
let opts = nu!(@nu_opts $($options)*);
|
|
// and format the `$path` using the `$part`s
|
|
let path = nu!(@format_path $path, $($part),*);
|
|
// Then finally we go to the `@main` phase, where the actual work is done.
|
|
nu!(@main opts, path)
|
|
}};
|
|
|
|
// Create the NuOpts struct from the `field => value ;` pairs
|
|
(@nu_opts $( $field:ident => $value:expr ; )*) => {
|
|
$crate::macros::NuOpts{
|
|
$(
|
|
$field: Some($value),
|
|
)*
|
|
..Default::default()
|
|
}
|
|
};
|
|
|
|
// Helper to format `$path`.
|
|
(@format_path $path:expr $(,)?) => {
|
|
// When there are no `$part`s, do not format anything
|
|
$path
|
|
};
|
|
(@format_path $path:expr, $($part:expr),* $(,)?) => {{
|
|
format!($path, $( $part ),*)
|
|
}};
|
|
|
|
// Do the actual work.
|
|
(@main $opts:expr, $path:expr) => {{
|
|
$crate::macros::nu_run_test($opts, $path, false)
|
|
}};
|
|
|
|
// This is the entrypoint for this macro.
|
|
($($token:tt)*) => {{
|
|
|
|
nu!(@options [ ] $($token)*)
|
|
}};
|
|
}
|
|
|
|
#[macro_export]
|
|
macro_rules! nu_with_std {
|
|
// In the `@options` phase, we restucture all the
|
|
// `$field_1: $value_1, $field_2: $value_2, ...`
|
|
// pairs to a structure like
|
|
// `@options[ $field_1 => $value_1 ; $field_2 => $value_2 ; ... ]`.
|
|
// We do this to later distinguish the options from the `$path` and `$part`s.
|
|
// (See
|
|
// https://users.rust-lang.org/t/i-dont-think-this-local-ambiguity-when-calling-macro-is-ambiguous/79401?u=x3ro
|
|
// )
|
|
//
|
|
// If there is any special treatment needed for the `$value`, we can just
|
|
// match for the specific `field` name.
|
|
(
|
|
@options [ $($options:tt)* ]
|
|
cwd: $value:expr,
|
|
$($rest:tt)*
|
|
) => {
|
|
nu!(@options [ $($options)* cwd => $crate::fs::in_directory($value) ; ] $($rest)*)
|
|
};
|
|
// For all other options, we call `.into()` on the `$value` and hope for the best. ;)
|
|
(
|
|
@options [ $($options:tt)* ]
|
|
$field:ident : $value:expr,
|
|
$($rest:tt)*
|
|
) => {
|
|
nu!(@options [ $($options)* $field => $value.into() ; ] $($rest)*)
|
|
};
|
|
|
|
// When the `$field: $value,` pairs are all parsed, the next tokens are the `$path` and any
|
|
// number of `$part`s, potentially followed by a trailing comma.
|
|
(
|
|
@options [ $($options:tt)* ]
|
|
$path:expr
|
|
$(, $part:expr)*
|
|
$(,)*
|
|
) => {{
|
|
// Here we parse the options into a `NuOpts` struct
|
|
let opts = nu!(@nu_opts $($options)*);
|
|
// and format the `$path` using the `$part`s
|
|
let path = nu!(@format_path $path, $($part),*);
|
|
// Then finally we go to the `@main` phase, where the actual work is done.
|
|
nu!(@main opts, path)
|
|
}};
|
|
|
|
// Create the NuOpts struct from the `field => value ;` pairs
|
|
(@nu_opts $( $field:ident => $value:expr ; )*) => {
|
|
$crate::macros::NuOpts{
|
|
$(
|
|
$field: Some($value),
|
|
)*
|
|
..Default::default()
|
|
}
|
|
};
|
|
|
|
// Helper to format `$path`.
|
|
(@format_path $path:expr $(,)?) => {
|
|
// When there are no `$part`s, do not format anything
|
|
$path
|
|
};
|
|
(@format_path $path:expr, $($part:expr),* $(,)?) => {{
|
|
format!($path, $( $part ),*)
|
|
}};
|
|
|
|
// Do the actual work.
|
|
(@main $opts:expr, $path:expr) => {{
|
|
$crate::macros::nu_run_test($opts, $path, true)
|
|
}};
|
|
|
|
// This is the entrypoint for this macro.
|
|
($($token:tt)*) => {{
|
|
nu!(@options [ ] $($token)*)
|
|
}};
|
|
}
|
|
|
|
#[macro_export]
|
|
macro_rules! nu_with_plugins {
|
|
(cwd: $cwd:expr, plugins: [$(($plugin_name:expr)),+$(,)?], $command:expr) => {{
|
|
nu_with_plugins!(
|
|
cwd: $cwd,
|
|
envs: Vec::<(&str, &str)>::new(),
|
|
plugins: [$(($plugin_name)),+],
|
|
$command
|
|
)
|
|
}};
|
|
(cwd: $cwd:expr, plugin: ($plugin_name:expr), $command:expr) => {{
|
|
nu_with_plugins!(
|
|
cwd: $cwd,
|
|
envs: Vec::<(&str, &str)>::new(),
|
|
plugin: ($plugin_name),
|
|
$command
|
|
)
|
|
}};
|
|
|
|
(
|
|
cwd: $cwd:expr,
|
|
envs: $envs:expr,
|
|
plugins: [$(($plugin_name:expr)),+$(,)?],
|
|
$command:expr
|
|
) => {{
|
|
$crate::macros::nu_with_plugin_run_test($cwd, $envs, &[$($plugin_name),+], $command)
|
|
}};
|
|
(cwd: $cwd:expr, envs: $envs:expr, plugin: ($plugin_name:expr), $command:expr) => {{
|
|
$crate::macros::nu_with_plugin_run_test($cwd, $envs, &[$plugin_name], $command)
|
|
}};
|
|
|
|
}
|
|
|
|
use crate::{Outcome, NATIVE_PATH_ENV_VAR};
|
|
use std::ffi::OsStr;
|
|
use std::fmt::Write;
|
|
use std::{
|
|
path::Path,
|
|
process::{Command, Stdio},
|
|
};
|
|
use tempfile::tempdir;
|
|
|
|
#[derive(Default)]
|
|
pub struct NuOpts {
|
|
pub cwd: Option<String>,
|
|
pub locale: Option<String>,
|
|
}
|
|
|
|
pub fn nu_run_test(opts: NuOpts, commands: impl AsRef<str>, with_std: bool) -> Outcome {
|
|
let test_bins = crate::fs::binaries();
|
|
|
|
let cwd = std::env::current_dir().expect("Could not get current working directory.");
|
|
let test_bins = nu_path::canonicalize_with(&test_bins, cwd).unwrap_or_else(|e| {
|
|
panic!(
|
|
"Couldn't canonicalize dummy binaries path {}: {:?}",
|
|
test_bins.display(),
|
|
e
|
|
)
|
|
});
|
|
|
|
let mut paths = crate::shell_os_paths();
|
|
paths.insert(0, test_bins);
|
|
|
|
let commands = commands.as_ref().lines().collect::<Vec<_>>().join("; ");
|
|
|
|
let paths_joined = match std::env::join_paths(paths) {
|
|
Ok(all) => all,
|
|
Err(_) => panic!("Couldn't join paths for PATH var."),
|
|
};
|
|
|
|
let target_cwd = opts.cwd.unwrap_or(".".to_string());
|
|
let locale = opts.locale.unwrap_or("en_US.UTF-8".to_string());
|
|
let executable_path = crate::fs::executable_path();
|
|
|
|
let mut command = setup_command(&executable_path, &target_cwd);
|
|
command
|
|
.env(nu_utils::locale::LOCALE_OVERRIDE_ENV_VAR, locale)
|
|
.env(NATIVE_PATH_ENV_VAR, paths_joined);
|
|
// Ensure that the user's config doesn't interfere with the tests
|
|
command.arg("--no-config-file");
|
|
if !with_std {
|
|
command.arg("--no-std-lib");
|
|
}
|
|
command
|
|
.arg(format!("-c {}", escape_quote_string(commands)))
|
|
.stdout(Stdio::piped())
|
|
.stderr(Stdio::piped());
|
|
|
|
// Uncomment to debug the command being run:
|
|
// println!("=== command\n{command:?}\n");
|
|
|
|
let process = match command.spawn() {
|
|
Ok(child) => child,
|
|
Err(why) => panic!("Can't run test {:?} {}", crate::fs::executable_path(), why),
|
|
};
|
|
|
|
let output = process
|
|
.wait_with_output()
|
|
.expect("couldn't read from stdout/stderr");
|
|
|
|
let out = collapse_output(&output.stdout);
|
|
let err = String::from_utf8_lossy(&output.stderr);
|
|
|
|
println!("=== stderr\n{}", err);
|
|
|
|
Outcome::new(out, err.into_owned(), output.status)
|
|
}
|
|
|
|
pub fn nu_with_plugin_run_test<E, K, V>(
|
|
cwd: impl AsRef<Path>,
|
|
envs: E,
|
|
plugins: &[&str],
|
|
command: &str,
|
|
) -> Outcome
|
|
where
|
|
E: IntoIterator<Item = (K, V)>,
|
|
K: AsRef<OsStr>,
|
|
V: AsRef<OsStr>,
|
|
{
|
|
let test_bins = crate::fs::binaries();
|
|
let test_bins = nu_path::canonicalize_with(&test_bins, ".").unwrap_or_else(|e| {
|
|
panic!(
|
|
"Couldn't canonicalize dummy binaries path {}: {:?}",
|
|
test_bins.display(),
|
|
e
|
|
)
|
|
});
|
|
|
|
let temp = tempdir().expect("couldn't create a temporary directory");
|
|
let [temp_config_file, temp_env_config_file, temp_plugin_file] =
|
|
["config.nu", "env.nu", "plugin.nu"].map(|name| {
|
|
let temp_file = temp.path().join(name);
|
|
std::fs::File::create(&temp_file).expect("couldn't create temporary config file");
|
|
temp_file
|
|
});
|
|
|
|
crate::commands::ensure_plugins_built();
|
|
|
|
let registrations: String = plugins
|
|
.iter()
|
|
.fold(String::new(), |mut output, plugin_name| {
|
|
let plugin = with_exe(plugin_name);
|
|
let plugin_path = nu_path::canonicalize_with(&plugin, &test_bins)
|
|
.unwrap_or_else(|_| panic!("failed to canonicalize plugin {} path", &plugin));
|
|
let plugin_path = plugin_path.to_string_lossy();
|
|
let _ = write!(output, "register {plugin_path};");
|
|
output
|
|
});
|
|
let commands = format!("{registrations}{command}");
|
|
|
|
let target_cwd = crate::fs::in_directory(&cwd);
|
|
// In plugin testing, we need to use installed nushell to drive
|
|
// plugin commands.
|
|
let mut executable_path = crate::fs::executable_path();
|
|
if !executable_path.exists() {
|
|
executable_path = crate::fs::installed_nu_path();
|
|
}
|
|
let process = match setup_command(&executable_path, &target_cwd)
|
|
.envs(envs)
|
|
.arg("--commands")
|
|
.arg(commands)
|
|
.arg("--config")
|
|
.arg(temp_config_file)
|
|
.arg("--env-config")
|
|
.arg(temp_env_config_file)
|
|
.arg("--plugin-config")
|
|
.arg(temp_plugin_file)
|
|
.stdout(Stdio::piped())
|
|
.stderr(Stdio::piped())
|
|
.spawn()
|
|
{
|
|
Ok(child) => child,
|
|
Err(why) => panic!("Can't run test {}", why),
|
|
};
|
|
|
|
let output = process
|
|
.wait_with_output()
|
|
.expect("couldn't read from stdout/stderr");
|
|
|
|
let out = collapse_output(&output.stdout);
|
|
let err = String::from_utf8_lossy(&output.stderr);
|
|
|
|
println!("=== stderr\n{}", err);
|
|
|
|
Outcome::new(out, err.into_owned(), output.status)
|
|
}
|
|
|
|
fn escape_quote_string(input: String) -> String {
|
|
let mut output = String::with_capacity(input.len() + 2);
|
|
output.push('"');
|
|
|
|
for c in input.chars() {
|
|
if c == '"' || c == '\\' {
|
|
output.push('\\');
|
|
}
|
|
output.push(c);
|
|
}
|
|
|
|
output.push('"');
|
|
output
|
|
}
|
|
|
|
fn with_exe(name: &str) -> String {
|
|
#[cfg(windows)]
|
|
{
|
|
name.to_string() + ".exe"
|
|
}
|
|
#[cfg(not(windows))]
|
|
{
|
|
name.to_string()
|
|
}
|
|
}
|
|
|
|
fn collapse_output(std: &[u8]) -> String {
|
|
let out = String::from_utf8_lossy(std);
|
|
let out = out.lines().collect::<Vec<_>>().join("\n");
|
|
let out = out.replace("\r\n", "");
|
|
out.replace('\n', "")
|
|
}
|
|
|
|
fn setup_command(executable_path: &Path, target_cwd: &str) -> Command {
|
|
let mut command = Command::new(executable_path);
|
|
|
|
command
|
|
.current_dir(target_cwd)
|
|
.env_remove("FILE_PWD")
|
|
.env("PWD", target_cwd); // setting PWD is enough to set cwd;
|
|
|
|
command
|
|
}
|