Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-28 20:43:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

cli: add new control server messages for wsl (#180438)

Browse Source 
* cli: add new control server messages for wsl

* support cwd in spawn
This commit is contained in:
Connor Peet
2023-04-20 15:19:05 -07:00
committed by GitHub
parent fd5ccc856c
commit cedf1eaa25
4 changed files with 108 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
cli/src/tunnels/control_server.rs
View File

@@ -21,6 +21,7 @@ use crate::util::http::{
};
use crate::util::io::SilentCopyProgress;
use crate::util::is_integrated_cli;
use crate::util::os::os_release;
use crate::util::sync::{new_barrier, Barrier};
use futures::stream::FuturesUnordered;
@@ -47,9 +48,10 @@ use super::paths::prune_stopped_servers;
use super::port_forwarder::{PortForwarding, PortForwardingProcessor};
use super::protocol::{
AcquireCliParams, CallServerHttpParams, CallServerHttpResult, ClientRequestMethod, EmptyObject,
ForwardParams, ForwardResult, GetHostnameResponse, HttpBodyParams, HttpHeadersParams,
ServeParams, ServerLog, ServerMessageParams, SpawnParams, SpawnResult, ToClientRequest,
UnforwardParams, UpdateParams, UpdateResult, VersionParams,
ForwardParams, ForwardResult, FsStatRequest, FsStatResponse, GetEnvResponse,
GetHostnameResponse, HttpBodyParams, HttpHeadersParams, ServeParams, ServerLog,
ServerMessageParams, SpawnParams, SpawnResult, ToClientRequest, UnforwardParams, UpdateParams,
UpdateResult, VersionParams,
};
use super::server_bridge::ServerBridge;
use super::server_multiplexer::ServerMultiplexer;
@@ -264,6 +266,8 @@ async fn process_socket(
rpc.register_sync("ping", |_: EmptyObject, _| Ok(EmptyObject {}));
rpc.register_sync("gethostname", |_: EmptyObject, _| handle_get_hostname());
rpc.register_sync("fs_stat", |p: FsStatRequest, _| handle_stat(p.path));
rpc.register_sync("get_env", |_: EmptyObject, _| handle_get_env());
rpc.register_async("serve", move |params: ServeParams, c| async move {
handle_serve(c, params).await
});
@@ -672,6 +676,34 @@ fn handle_get_hostname() -> Result<GetHostnameResponse, AnyError> {
})
}
fn handle_stat(path: String) -> Result<FsStatResponse, AnyError> {
Ok(std::fs::metadata(path)
.map(|m| FsStatResponse {
exists: true,
size: Some(m.len()),
kind: Some(match m.file_type() {
t if t.is_dir() => "dir",
t if t.is_file() => "file",
t if t.is_symlink() => "link",
_ => "unknown",
}),
})
.unwrap_or_default())
}
fn handle_get_env() -> Result<GetEnvResponse, AnyError> {
Ok(GetEnvResponse {
env: std::env::vars().collect(),
os_release: os_release().unwrap_or_else(|_| "unknown".to_string()),
#[cfg(windows)]
os_platform: "win32",
#[cfg(target_os = "linux")]
os_platform: "linux",
#[cfg(target_os = "macos")]
os_platform: "darwin",
})
}
async fn handle_forward(
log: &log::Logger,
port_forwarding: &PortForwarding,
@@ -804,14 +836,17 @@ where
};
}
let mut p = tokio::process::Command::new(&params.command)
.args(&params.args)
.envs(&params.env)
.stdin(pipe_if_some!(stdin))
.stdout(pipe_if_some!(stdout))
.stderr(pipe_if_some!(stderr))
.spawn()
.map_err(CodeError::ProcessSpawnFailed)?;
let mut p = tokio::process::Command::new(&params.command);
p.args(&params.args);
p.envs(&params.env);
p.stdin(pipe_if_some!(stdin));
p.stdout(pipe_if_some!(stdout));
p.stderr(pipe_if_some!(stderr));
if let Some(cwd) = &params.cwd {
p.current_dir(cwd);
}
let mut p = p.spawn().map_err(CodeError::ProcessSpawnFailed)?;
let futs = FuturesUnordered::new();
if let (Some(mut a), Some(mut b)) = (p.stdout.take(), stdout) {