mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-28 20:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Avoid user NPM config/cache & put NodeRuntime installation behind a lock

Browse source
This commit is contained in:
Julia 2023-11-14 14:47:00 -05:00
parent 5c8db996ee
commit 59ec9e508b
1 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
crates/node_runtime/src/node_runtime.rs
View file

@ -2,7 +2,7 @@ use anyhow::{anyhow, bail, Context, Result};
use async_compression::futures::bufread::GzipDecoder; use async_compression::futures::bufread::GzipDecoder;
use async_tar::Archive; use async_tar::Archive;
use serde::Deserialize; use serde::Deserialize;
use smol::{fs, io::BufReader, process::Command}; use smol::{fs, io::BufReader, lock::Mutex, process::Command};
use std::process::{Output, Stdio}; use std::process::{Output, Stdio};
use std::{ use std::{
env::consts, env::consts,
@ -45,14 +45,19 @@ pub trait NodeRuntime: Send + Sync {
pub struct RealNodeRuntime { pub struct RealNodeRuntime {
http: Arc<dyn HttpClient>, http: Arc<dyn HttpClient>,
installation_lock: Mutex<()>,
} }
impl RealNodeRuntime { impl RealNodeRuntime {
pub fn new(http: Arc<dyn HttpClient>) -> Arc<dyn NodeRuntime> { pub fn new(http: Arc<dyn HttpClient>) -> Arc<dyn NodeRuntime> {
Arc::new(RealNodeRuntime { http }) Arc::new(RealNodeRuntime {
http,
installation_lock: Mutex::new(()),
})
} }
async fn install_if_needed(&self) -> Result<PathBuf> { async fn install_if_needed(&self) -> Result<PathBuf> {
let _lock = self.installation_lock.lock().await;
log::info!("Node runtime install_if_needed"); log::info!("Node runtime install_if_needed");
let arch = match consts::ARCH { let arch = match consts::ARCH {
@ -73,6 +78,9 @@ impl RealNodeRuntime {
.stdin(Stdio::null()) .stdin(Stdio::null())
.stdout(Stdio::null()) .stdout(Stdio::null())
.stderr(Stdio::null()) .stderr(Stdio::null())
.args(["--cache".into(), node_dir.join("cache")])
.args(["--userconfig".into(), node_dir.join("blank_user_npmrc")])
.args(["--globalconfig".into(), node_dir.join("blank_global_npmrc")])
.status() .status()
.await; .await;
let valid = matches!(result, Ok(status) if status.success()); let valid = matches!(result, Ok(status) if status.success());
@ -96,6 +104,11 @@ impl RealNodeRuntime {
archive.unpack(&node_containing_dir).await?; archive.unpack(&node_containing_dir).await?;
} }
// Note: Not in the `if !valid {}` so we can populate these for existing installations
_ = fs::create_dir(node_dir.join("cache")).await;
_ = fs::write(node_dir.join("blank_user_npmrc"), []).await;
_ = fs::write(node_dir.join("blank_global_npmrc"), []).await;
anyhow::Ok(node_dir) anyhow::Ok(node_dir)
} }
} }
@ -137,7 +150,17 @@ impl NodeRuntime for RealNodeRuntime {
let mut command = Command::new(node_binary); let mut command = Command::new(node_binary);
command.env("PATH", env_path); command.env("PATH", env_path);
command.arg(npm_file).arg(subcommand).args(args); command.arg(npm_file).arg(subcommand);
command.args(["--cache".into(), installation_path.join("cache")]);
command.args([
"--userconfig".into(),
installation_path.join("blank_user_npmrc"),
]);
command.args([
"--globalconfig".into(),
installation_path.join("blank_global_npmrc"),
]);
command.args(args);
if let Some(directory) = directory { if let Some(directory) = directory {
command.current_dir(directory); command.current_dir(directory);