From 3735a1a54225a058914f4356c2d271bb12fab6a7 Mon Sep 17 00:00:00 2001 From: Divy Srivastava Date: Fri, 7 Jun 2024 22:51:32 +0530 Subject: fix(ext/node): support stdin child_process IPC & fd stdout/stderr (#24106) Add supports for "ipc" and fd options in child_process spawn API. Internal changes: Adds a hidden rid and "ipc_for_internal_use" option to Deno.Command. Used by `node:child_process` Example: ```js const out = fs.openSync("./logfile.txt", 'a') const proc = spawn(process.execPath, ["./main.mjs", "child"], { stdio: ["ipc", out, "inherit"] }); ``` Ref #16753 --- runtime/ops/process.rs | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) (limited to 'runtime/ops') diff --git a/runtime/ops/process.rs b/runtime/ops/process.rs index b894b35db..ecf6ef49b 100644 --- a/runtime/ops/process.rs +++ b/runtime/ops/process.rs @@ -37,11 +37,12 @@ use std::os::unix::process::CommandExt; pub const UNSTABLE_FEATURE_NAME: &str = "process"; #[derive(Copy, Clone, Eq, PartialEq, Deserialize)] -#[serde(rename_all = "camelCase")] +#[serde(rename_all = "snake_case")] pub enum Stdio { Inherit, Piped, Null, + IpcForInternalUse, } impl Stdio { @@ -50,6 +51,7 @@ impl Stdio { Stdio::Inherit => std::process::Stdio::inherit(), Stdio::Piped => std::process::Stdio::piped(), Stdio::Null => std::process::Stdio::null(), + _ => unreachable!(), } } } @@ -72,6 +74,9 @@ impl<'de> Deserialize<'de> for StdioOrRid { "inherit" => Ok(StdioOrRid::Stdio(Stdio::Inherit)), "piped" => Ok(StdioOrRid::Stdio(Stdio::Piped)), "null" => Ok(StdioOrRid::Stdio(Stdio::Null)), + "ipc_for_internal_use" => { + Ok(StdioOrRid::Stdio(Stdio::IpcForInternalUse)) + } val => Err(serde::de::Error::unknown_variant( val, &["inherit", "piped", "null"], @@ -102,6 +107,10 @@ impl StdioOrRid { } } } + + pub fn is_ipc(&self) -> bool { + matches!(self, StdioOrRid::Stdio(Stdio::IpcForInternalUse)) + } } deno_core::extension!( @@ -150,9 +159,9 @@ pub struct SpawnArgs { #[derive(Deserialize)] #[serde(rename_all = "camelCase")] pub struct ChildStdio { - stdin: Stdio, - stdout: Stdio, - stderr: Stdio, + stdin: StdioOrRid, + stdout: StdioOrRid, + stderr: StdioOrRid, } #[derive(Serialize)] @@ -210,7 +219,7 @@ type CreateCommand = (std::process::Command, Option); fn create_command( state: &mut OpState, - args: SpawnArgs, + mut args: SpawnArgs, api_name: &str, ) -> Result { state @@ -249,14 +258,19 @@ fn create_command( command.uid(uid); } - command.stdin(args.stdio.stdin.as_stdio()); + if args.stdio.stdin.is_ipc() { + args.ipc = Some(0); + } else { + command.stdin(args.stdio.stdin.as_stdio(state)?); + } + command.stdout(match args.stdio.stdout { - Stdio::Inherit => StdioOrRid::Rid(1).as_stdio(state)?, - value => value.as_stdio(), + StdioOrRid::Stdio(Stdio::Inherit) => StdioOrRid::Rid(1).as_stdio(state)?, + value => value.as_stdio(state)?, }); command.stderr(match args.stdio.stderr { - Stdio::Inherit => StdioOrRid::Rid(2).as_stdio(state)?, - value => value.as_stdio(), + StdioOrRid::Stdio(Stdio::Inherit) => StdioOrRid::Rid(2).as_stdio(state)?, + value => value.as_stdio(state)?, }); #[cfg(unix)] @@ -608,8 +622,8 @@ fn op_spawn_sync( state: &mut OpState, #[serde] args: SpawnArgs, ) -> Result { - let stdout = matches!(args.stdio.stdout, Stdio::Piped); - let stderr = matches!(args.stdio.stderr, Stdio::Piped); + let stdout = matches!(args.stdio.stdout, StdioOrRid::Stdio(Stdio::Piped)); + let stderr = matches!(args.stdio.stderr, StdioOrRid::Stdio(Stdio::Piped)); let (mut command, _) = create_command(state, args, "Deno.Command().outputSync()")?; let output = command.output().with_context(|| { -- cgit v1.2.3