summaryrefslogtreecommitdiff
path: root/cli/npm
diff options
context:
space:
mode:
Diffstat (limited to 'cli/npm')
-rw-r--r--cli/npm/cache.rs38
-rw-r--r--cli/npm/mod.rs21
-rw-r--r--cli/npm/registry.rs91
3 files changed, 125 insertions, 25 deletions
diff --git a/cli/npm/cache.rs b/cli/npm/cache.rs
index 0efbe93f7..5e6fb7ca8 100644
--- a/cli/npm/cache.rs
+++ b/cli/npm/cache.rs
@@ -7,12 +7,14 @@ use std::path::PathBuf;
use deno_ast::ModuleSpecifier;
use deno_core::anyhow::bail;
use deno_core::anyhow::Context;
+use deno_core::error::custom_error;
use deno_core::error::AnyError;
use deno_core::url::Url;
use deno_runtime::colors;
use deno_runtime::deno_fetch::reqwest;
use crate::deno_dir::DenoDir;
+use crate::file_fetcher::CacheSetting;
use crate::fs_util;
use super::tarball::verify_and_extract_tarball;
@@ -152,15 +154,24 @@ impl ReadonlyNpmCache {
/// Stores a single copy of npm packages in a cache.
#[derive(Clone, Debug)]
-pub struct NpmCache(ReadonlyNpmCache);
+pub struct NpmCache {
+ readonly: ReadonlyNpmCache,
+ cache_setting: CacheSetting,
+}
impl NpmCache {
- pub fn from_deno_dir(dir: &DenoDir) -> Result<Self, AnyError> {
- Ok(Self(ReadonlyNpmCache::from_deno_dir(dir)?))
+ pub fn from_deno_dir(
+ dir: &DenoDir,
+ cache_setting: CacheSetting,
+ ) -> Result<Self, AnyError> {
+ Ok(Self {
+ readonly: ReadonlyNpmCache::from_deno_dir(dir)?,
+ cache_setting,
+ })
}
pub fn as_readonly(&self) -> ReadonlyNpmCache {
- self.0.clone()
+ self.readonly.clone()
}
pub async fn ensure_package(
@@ -169,13 +180,22 @@ impl NpmCache {
dist: &NpmPackageVersionDistInfo,
registry_url: &Url,
) -> Result<(), AnyError> {
- let package_folder = self.0.package_folder(id, registry_url);
+ let package_folder = self.readonly.package_folder(id, registry_url);
if package_folder.exists()
// if this file exists, then the package didn't successfully extract
// the first time, or another process is currently extracting the zip file
&& !package_folder.join(NPM_PACKAGE_SYNC_LOCK_FILENAME).exists()
{
return Ok(());
+ } else if self.cache_setting == CacheSetting::Only {
+ return Err(custom_error(
+ "NotCached",
+ format!(
+ "An npm specifier not found in cache: \"{}\", --cached-only is specified.",
+ id.name
+ )
+ )
+ );
}
log::log!(
@@ -225,15 +245,15 @@ impl NpmCache {
id: &NpmPackageId,
registry_url: &Url,
) -> PathBuf {
- self.0.package_folder(id, registry_url)
+ self.readonly.package_folder(id, registry_url)
}
pub fn package_name_folder(&self, name: &str, registry_url: &Url) -> PathBuf {
- self.0.package_name_folder(name, registry_url)
+ self.readonly.package_name_folder(name, registry_url)
}
pub fn registry_folder(&self, registry_url: &Url) -> PathBuf {
- self.0.registry_folder(registry_url)
+ self.readonly.registry_folder(registry_url)
}
pub fn resolve_package_id_from_specifier(
@@ -242,7 +262,7 @@ impl NpmCache {
registry_url: &Url,
) -> Result<NpmPackageId, AnyError> {
self
- .0
+ .readonly
.resolve_package_id_from_specifier(specifier, registry_url)
}
}
diff --git a/cli/npm/mod.rs b/cli/npm/mod.rs
index 810cee645..16796b18a 100644
--- a/cli/npm/mod.rs
+++ b/cli/npm/mod.rs
@@ -29,6 +29,7 @@ use registry::NpmRegistryApi;
use resolution::NpmResolution;
use crate::deno_dir::DenoDir;
+use crate::file_fetcher::CacheSetting;
use self::cache::ReadonlyNpmCache;
use self::resolution::NpmResolutionSnapshot;
@@ -77,12 +78,24 @@ pub struct GlobalNpmPackageResolver {
}
impl GlobalNpmPackageResolver {
- pub fn from_deno_dir(dir: &DenoDir, reload: bool) -> Result<Self, AnyError> {
- Ok(Self::from_cache(NpmCache::from_deno_dir(dir)?, reload))
+ pub fn from_deno_dir(
+ dir: &DenoDir,
+ reload: bool,
+ cache_setting: CacheSetting,
+ ) -> Result<Self, AnyError> {
+ Ok(Self::from_cache(
+ NpmCache::from_deno_dir(dir, cache_setting.clone())?,
+ reload,
+ cache_setting,
+ ))
}
- fn from_cache(cache: NpmCache, reload: bool) -> Self {
- let api = NpmRegistryApi::new(cache.clone(), reload);
+ fn from_cache(
+ cache: NpmCache,
+ reload: bool,
+ cache_setting: CacheSetting,
+ ) -> Self {
+ let api = NpmRegistryApi::new(cache.clone(), reload, cache_setting);
let registry_url = api.base_url().to_owned();
let resolution = Arc::new(NpmResolution::new(api));
diff --git a/cli/npm/registry.rs b/cli/npm/registry.rs
index 5da5b6c7f..e04531017 100644
--- a/cli/npm/registry.rs
+++ b/cli/npm/registry.rs
@@ -2,11 +2,13 @@
use std::collections::HashMap;
use std::fs;
+use std::io::ErrorKind;
use std::path::PathBuf;
use std::sync::Arc;
use deno_core::anyhow::bail;
use deno_core::anyhow::Context;
+use deno_core::error::custom_error;
use deno_core::error::AnyError;
use deno_core::parking_lot::Mutex;
use deno_core::serde::Deserialize;
@@ -16,6 +18,7 @@ use deno_runtime::colors;
use deno_runtime::deno_fetch::reqwest;
use serde::Serialize;
+use crate::file_fetcher::CacheSetting;
use crate::fs_util;
use crate::http_cache::CACHE_PERM;
@@ -100,6 +103,7 @@ pub struct NpmRegistryApi {
cache: NpmCache,
mem_cache: Arc<Mutex<HashMap<String, Option<NpmPackageInfo>>>>,
reload: bool,
+ cache_setting: CacheSetting,
}
impl NpmRegistryApi {
@@ -122,16 +126,26 @@ impl NpmRegistryApi {
}
}
- pub fn new(cache: NpmCache, reload: bool) -> Self {
- Self::from_base(Self::default_url(), cache, reload)
+ pub fn new(
+ cache: NpmCache,
+ reload: bool,
+ cache_setting: CacheSetting,
+ ) -> Self {
+ Self::from_base(Self::default_url(), cache, reload, cache_setting)
}
- pub fn from_base(base_url: Url, cache: NpmCache, reload: bool) -> Self {
+ pub fn from_base(
+ base_url: Url,
+ cache: NpmCache,
+ reload: bool,
+ cache_setting: CacheSetting,
+ ) -> Self {
Self {
base_url,
cache,
mem_cache: Default::default(),
reload,
+ cache_setting,
}
}
@@ -163,6 +177,7 @@ impl NpmRegistryApi {
// attempt to load from the file cache
maybe_package_info = self.load_file_cached_package_info(name);
}
+
if maybe_package_info.is_none() {
maybe_package_info = self
.load_package_info_from_registry(name)
@@ -191,13 +206,14 @@ impl NpmRegistryApi {
&self,
name: &str,
) -> Option<NpmPackageInfo> {
- let file_cache_path = self.get_package_file_cache_path(name);
- let file_text = fs::read_to_string(file_cache_path).ok()?;
- match serde_json::from_str(&file_text) {
- Ok(result) => Some(result),
+ match self.load_file_cached_package_info_result(name) {
+ Ok(value) => value,
Err(err) => {
if cfg!(debug_assertions) {
- panic!("could not deserialize: {:#}", err);
+ panic!(
+ "error loading cached npm package info for {}: {:#}",
+ name, err
+ );
} else {
None
}
@@ -205,22 +221,73 @@ impl NpmRegistryApi {
}
}
+ fn load_file_cached_package_info_result(
+ &self,
+ name: &str,
+ ) -> Result<Option<NpmPackageInfo>, AnyError> {
+ let file_cache_path = self.get_package_file_cache_path(name);
+ let file_text = match fs::read_to_string(file_cache_path) {
+ Ok(file_text) => file_text,
+ Err(err) if err.kind() == ErrorKind::NotFound => return Ok(None),
+ Err(err) => return Err(err.into()),
+ };
+ Ok(serde_json::from_str(&file_text)?)
+ }
+
fn save_package_info_to_file_cache(
&self,
name: &str,
package_info: &NpmPackageInfo,
) {
+ if let Err(err) =
+ self.save_package_info_to_file_cache_result(name, package_info)
+ {
+ if cfg!(debug_assertions) {
+ panic!(
+ "error saving cached npm package info for {}: {:#}",
+ name, err
+ );
+ }
+ }
+ }
+
+ fn save_package_info_to_file_cache_result(
+ &self,
+ name: &str,
+ package_info: &NpmPackageInfo,
+ ) -> Result<(), AnyError> {
let file_cache_path = self.get_package_file_cache_path(name);
- let file_text = serde_json::to_string_pretty(&package_info).unwrap();
- let _ignore =
- fs_util::atomic_write_file(&file_cache_path, file_text, CACHE_PERM);
+ let file_text = serde_json::to_string(&package_info)?;
+ std::fs::create_dir_all(&file_cache_path.parent().unwrap())?;
+ fs_util::atomic_write_file(&file_cache_path, file_text, CACHE_PERM)?;
+ Ok(())
}
async fn load_package_info_from_registry(
&self,
name: &str,
) -> Result<Option<NpmPackageInfo>, AnyError> {
- let response = match reqwest::get(self.get_package_url(name)).await {
+ if self.cache_setting == CacheSetting::Only {
+ return Err(custom_error(
+ "NotCached",
+ format!(
+ "An npm specifier not found in cache: \"{}\", --cached-only is specified.",
+ name
+ )
+ )
+ );
+ }
+
+ let package_url = self.get_package_url(name);
+
+ log::log!(
+ log::Level::Info,
+ "{} {}",
+ colors::green("Download"),
+ package_url,
+ );
+
+ let response = match reqwest::get(package_url).await {
Ok(response) => response,
Err(err) => {
// attempt to use the local cache
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-17 08:18:43 +0000