mirror of
https://github.com/denoland/deno.git
synced 2024-12-12 02:27:46 -05:00
3392a8e530
Partially supersedes #19016. This migrates `spawn` and `spawn_blocking` to `deno_core`, and removes the requirement for `spawn` tasks to be `Send` given our single-threaded executor. While we don't need to technically do anything w/`spawn_blocking`, this allows us to have a single `JoinHandle` type that works for both cases, and allows us to more easily experiment with alternative `spawn_blocking` implementations that do not require tokio (ie: rayon). Async ops (+~35%): Before: ``` time 1310 ms rate 763358 time 1267 ms rate 789265 time 1259 ms rate 794281 time 1266 ms rate 789889 ``` After: ``` time 956 ms rate 1046025 time 954 ms rate 1048218 time 924 ms rate 1082251 time 920 ms rate 1086956 ``` HTTP serve (+~4.4%): Before: ``` Running 10s test @ http://localhost:4500 2 threads and 10 connections Thread Stats Avg Stdev Max +/- Stdev Latency 68.78us 19.77us 1.43ms 86.84% Req/Sec 68.78k 5.00k 73.84k 91.58% 1381833 requests in 10.10s, 167.36MB read Requests/sec: 136823.29 Transfer/sec: 16.57MB ``` After: ``` Running 10s test @ http://localhost:4500 2 threads and 10 connections Thread Stats Avg Stdev Max +/- Stdev Latency 63.12us 17.43us 1.11ms 85.13% Req/Sec 71.82k 3.71k 77.02k 79.21% 1443195 requests in 10.10s, 174.79MB read Requests/sec: 142921.99 Transfer/sec: 17.31MB ``` Suggested-By: alice@ryhl.io Co-authored-by: Bartek Iwańczuk <biwanczuk@gmail.com>
143 lines
3.9 KiB
Rust
143 lines
3.9 KiB
Rust
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
|
|
|
|
use std::io::ErrorKind;
|
|
use std::path::Path;
|
|
use std::path::PathBuf;
|
|
use std::sync::Arc;
|
|
|
|
use async_trait::async_trait;
|
|
use deno_ast::ModuleSpecifier;
|
|
use deno_core::error::AnyError;
|
|
use deno_core::futures;
|
|
use deno_core::task::spawn;
|
|
use deno_core::url::Url;
|
|
use deno_npm::NpmPackageId;
|
|
use deno_npm::NpmResolutionPackage;
|
|
use deno_runtime::deno_fs::FileSystem;
|
|
use deno_runtime::deno_node::NodePermissions;
|
|
use deno_runtime::deno_node::NodeResolutionMode;
|
|
|
|
use crate::npm::cache::should_sync_download;
|
|
use crate::npm::NpmCache;
|
|
|
|
/// Part of the resolution that interacts with the file system.
|
|
#[async_trait]
|
|
pub trait NpmPackageFsResolver: Send + Sync {
|
|
/// Specifier for the root directory.
|
|
fn root_dir_url(&self) -> &Url;
|
|
|
|
/// The local node_modules folder if it is applicable to the implementation.
|
|
fn node_modules_path(&self) -> Option<PathBuf>;
|
|
|
|
fn package_folder(
|
|
&self,
|
|
package_id: &NpmPackageId,
|
|
) -> Result<PathBuf, AnyError>;
|
|
fn resolve_package_folder_from_package(
|
|
&self,
|
|
name: &str,
|
|
referrer: &ModuleSpecifier,
|
|
mode: NodeResolutionMode,
|
|
) -> Result<PathBuf, AnyError>;
|
|
|
|
fn resolve_package_folder_from_specifier(
|
|
&self,
|
|
specifier: &ModuleSpecifier,
|
|
) -> Result<PathBuf, AnyError>;
|
|
|
|
async fn cache_packages(&self) -> Result<(), AnyError>;
|
|
|
|
fn ensure_read_permission(
|
|
&self,
|
|
permissions: &dyn NodePermissions,
|
|
path: &Path,
|
|
) -> Result<(), AnyError>;
|
|
}
|
|
|
|
/// Caches all the packages in parallel.
|
|
pub async fn cache_packages(
|
|
mut packages: Vec<NpmResolutionPackage>,
|
|
cache: &Arc<NpmCache>,
|
|
registry_url: &Url,
|
|
) -> Result<(), AnyError> {
|
|
let sync_download = should_sync_download();
|
|
if sync_download {
|
|
// we're running the tests not with --quiet
|
|
// and we want the output to be deterministic
|
|
packages.sort_by(|a, b| a.pkg_id.cmp(&b.pkg_id));
|
|
}
|
|
|
|
let mut handles = Vec::with_capacity(packages.len());
|
|
for package in packages {
|
|
assert_eq!(package.copy_index, 0); // the caller should not provide any of these
|
|
let cache = cache.clone();
|
|
let registry_url = registry_url.clone();
|
|
let handle = spawn(async move {
|
|
cache
|
|
.ensure_package(&package.pkg_id.nv, &package.dist, ®istry_url)
|
|
.await
|
|
});
|
|
if sync_download {
|
|
handle.await??;
|
|
} else {
|
|
handles.push(handle);
|
|
}
|
|
}
|
|
let results = futures::future::join_all(handles).await;
|
|
for result in results {
|
|
// surface the first error
|
|
result??;
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
pub fn ensure_registry_read_permission(
|
|
fs: &Arc<dyn FileSystem>,
|
|
permissions: &dyn NodePermissions,
|
|
registry_path: &Path,
|
|
path: &Path,
|
|
) -> Result<(), AnyError> {
|
|
// allow reading if it's in the node_modules
|
|
if path.starts_with(registry_path)
|
|
&& path
|
|
.components()
|
|
.all(|c| !matches!(c, std::path::Component::ParentDir))
|
|
{
|
|
// todo(dsherret): cache this?
|
|
if let Ok(registry_path) = fs.realpath_sync(registry_path) {
|
|
match fs.realpath_sync(path) {
|
|
Ok(path) if path.starts_with(registry_path) => {
|
|
return Ok(());
|
|
}
|
|
Err(e) if e.kind() == ErrorKind::NotFound => {
|
|
return Ok(());
|
|
}
|
|
_ => {} // ignore
|
|
}
|
|
}
|
|
}
|
|
|
|
permissions.check_read(path)
|
|
}
|
|
|
|
/// Gets the corresponding @types package for the provided package name.
|
|
pub fn types_package_name(package_name: &str) -> String {
|
|
debug_assert!(!package_name.starts_with("@types/"));
|
|
// Scoped packages will get two underscores for each slash
|
|
// https://github.com/DefinitelyTyped/DefinitelyTyped/tree/15f1ece08f7b498f4b9a2147c2a46e94416ca777#what-about-scoped-packages
|
|
format!("@types/{}", package_name.replace('/', "__"))
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::types_package_name;
|
|
|
|
#[test]
|
|
fn test_types_package_name() {
|
|
assert_eq!(types_package_name("name"), "@types/name");
|
|
assert_eq!(
|
|
types_package_name("@scoped/package"),
|
|
"@types/@scoped__package"
|
|
);
|
|
}
|
|
}
|