mirror of
https://github.com/denoland/deno.git
synced 2025-09-27 20:59:10 +00:00

Fixes #27264. Fixes https://github.com/denoland/deno/issues/28161. Currently the new lockfile version is gated behind an unstable flag (`--unstable-lockfile-v5`) until the next minor release, where it will become the default. The main motivation here is that it improves startup performance when using the global cache or `--node-modules-dir=auto`. In a create-next-app project, running an empty file: ``` ❯ hyperfine --warmup 25 -N --setup "rm -f deno.lock" "deno run --node-modules-dir=auto -A empty.js" "deno-this-pr run --node-modules-dir=auto -A empty.js" "deno-this-pr run --node-modules-dir=auto --unstable-lockfile-v5 empty.js" "deno run --node-modules-dir=manual -A empty.js" "deno-this-pr run --node-modules-dir=manual -A empty.js" Benchmark 1: deno run --node-modules-dir=auto -A empty.js Time (mean ± σ): 247.6 ms ± 1.7 ms [User: 228.7 ms, System: 19.0 ms] Range (min … max): 245.5 ms … 251.5 ms 12 runs Benchmark 2: deno-this-pr run --node-modules-dir=auto -A empty.js Time (mean ± σ): 169.8 ms ± 1.0 ms [User: 152.9 ms, System: 17.9 ms] Range (min … max): 168.9 ms … 172.5 ms 17 runs Benchmark 3: deno-this-pr run --node-modules-dir=auto --unstable-lockfile-v5 empty.js Time (mean ± σ): 16.2 ms ± 0.7 ms [User: 12.3 ms, System: 5.7 ms] Range (min … max): 15.2 ms … 19.2 ms 185 runs Benchmark 4: deno run --node-modules-dir=manual -A empty.js Time (mean ± σ): 16.2 ms ± 0.8 ms [User: 11.6 ms, System: 5.5 ms] Range (min … max): 14.9 ms … 19.7 ms 187 runs Benchmark 5: deno-this-pr run --node-modules-dir=manual -A empty.js Time (mean ± σ): 16.0 ms ± 0.9 ms [User: 12.0 ms, System: 5.5 ms] Range (min … max): 14.8 ms … 22.3 ms 190 runs Warning: Statistical outliers were detected. Consider re-running this benchmark on a quiet system without any interferences from other programs. It might help to use the '--warmup' or '--prepare' options. Summary deno-this-pr run --node-modules-dir=manual -A empty.js ran 1.01 ± 0.08 times faster than deno run --node-modules-dir=manual -A empty.js 1.01 ± 0.07 times faster than deno-this-pr run --node-modules-dir=auto --unstable-lockfile-v5 empty.js 10.64 ± 0.60 times faster than deno-this-pr run --node-modules-dir=auto -A empty.js 15.51 ± 0.88 times faster than deno run --node-modules-dir=auto -A empty.js ``` When using the new lockfile version, this leads to a 15.5x faster startup time compared to the current deno version. Install times benefit as well, though to a lesser degree. `deno install` on a create-next-app project, with everything cached (just setting up node_modules from scratch): ``` ❯ hyperfine --warmup 5 -N --prepare "rm -rf node_modules" --setup "rm -rf deno.lock" "deno i" "deno-this-pr i" "deno-this-pr i --unstable-lockfile-v5" Benchmark 1: deno i Time (mean ± σ): 464.4 ms ± 8.8 ms [User: 227.7 ms, System: 217.3 ms] Range (min … max): 452.6 ms … 478.3 ms 10 runs Benchmark 2: deno-this-pr i Time (mean ± σ): 368.8 ms ± 22.0 ms [User: 150.8 ms, System: 198.1 ms] Range (min … max): 344.8 ms … 397.6 ms 10 runs Benchmark 3: deno-this-pr i --unstable-lockfile-v5 Time (mean ± σ): 211.9 ms ± 17.1 ms [User: 7.1 ms, System: 177.2 ms] Range (min … max): 191.3 ms … 233.4 ms 10 runs Summary deno-this-pr i --unstable-lockfile-v5 ran 1.74 ± 0.17 times faster than deno-this-pr i 2.19 ± 0.18 times faster than deno i ``` With lockfile v5, a 2.19x faster install time compared to the current deno.
182 lines
4.9 KiB
Rust
182 lines
4.9 KiB
Rust
// Copyright 2018-2025 the Deno authors. MIT license.
|
|
|
|
use std::sync::Arc;
|
|
|
|
use deno_core::error::AnyError;
|
|
use deno_core::futures::FutureExt;
|
|
use deno_core::futures::TryFutureExt;
|
|
use deno_core::ModuleSpecifier;
|
|
|
|
use super::run::check_permission_before_script;
|
|
use super::run::maybe_npm_install;
|
|
use crate::args::Flags;
|
|
use crate::args::ServeFlags;
|
|
use crate::args::WatchFlagsWithPaths;
|
|
use crate::factory::CliFactory;
|
|
use crate::util::file_watcher::WatcherRestartMode;
|
|
use crate::worker::CliMainWorkerFactory;
|
|
|
|
pub async fn serve(
|
|
flags: Arc<Flags>,
|
|
serve_flags: ServeFlags,
|
|
) -> Result<i32, AnyError> {
|
|
check_permission_before_script(&flags);
|
|
|
|
if let Some(watch_flags) = serve_flags.watch {
|
|
return serve_with_watch(flags, watch_flags, serve_flags.worker_count)
|
|
.await;
|
|
}
|
|
|
|
let factory = CliFactory::from_flags(flags);
|
|
let cli_options = factory.cli_options()?;
|
|
let deno_dir = factory.deno_dir()?;
|
|
let http_client = factory.http_client_provider();
|
|
|
|
// Run a background task that checks for available upgrades or output
|
|
// if an earlier run of this background task found a new version of Deno.
|
|
#[cfg(feature = "upgrade")]
|
|
super::upgrade::check_for_upgrades(
|
|
http_client.clone(),
|
|
deno_dir.upgrade_check_file_path(),
|
|
);
|
|
|
|
let main_module = cli_options.resolve_main_module()?;
|
|
|
|
maybe_npm_install(&factory).await?;
|
|
|
|
let worker_factory =
|
|
Arc::new(factory.create_cli_main_worker_factory().await?);
|
|
let hmr = serve_flags
|
|
.watch
|
|
.map(|watch_flags| watch_flags.hmr)
|
|
.unwrap_or(false);
|
|
do_serve(
|
|
worker_factory,
|
|
main_module.clone(),
|
|
serve_flags.worker_count,
|
|
hmr,
|
|
)
|
|
.await
|
|
}
|
|
|
|
async fn do_serve(
|
|
worker_factory: Arc<CliMainWorkerFactory>,
|
|
main_module: ModuleSpecifier,
|
|
worker_count: Option<usize>,
|
|
hmr: bool,
|
|
) -> Result<i32, AnyError> {
|
|
let mut worker = worker_factory
|
|
.create_main_worker(
|
|
deno_runtime::WorkerExecutionMode::Serve {
|
|
is_main: true,
|
|
worker_count,
|
|
},
|
|
main_module.clone(),
|
|
)
|
|
.await?;
|
|
let worker_count = match worker_count {
|
|
None | Some(1) => return worker.run().await.map_err(Into::into),
|
|
Some(c) => c,
|
|
};
|
|
|
|
let main = deno_core::unsync::spawn(async move { worker.run().await });
|
|
|
|
let extra_workers = worker_count.saturating_sub(1);
|
|
|
|
let mut channels = Vec::with_capacity(extra_workers);
|
|
for i in 0..extra_workers {
|
|
let worker_factory = worker_factory.clone();
|
|
let main_module = main_module.clone();
|
|
let (tx, rx) = tokio::sync::oneshot::channel();
|
|
channels.push(rx);
|
|
std::thread::Builder::new()
|
|
.name(format!("serve-worker-{i}"))
|
|
.spawn(move || {
|
|
deno_runtime::tokio_util::create_and_run_current_thread(async move {
|
|
let result = run_worker(i, worker_factory, main_module, hmr).await;
|
|
let _ = tx.send(result);
|
|
});
|
|
})?;
|
|
}
|
|
|
|
let (main_result, worker_results) = tokio::try_join!(
|
|
main.map_err(AnyError::from),
|
|
deno_core::futures::future::try_join_all(
|
|
channels.into_iter().map(|r| r.map_err(AnyError::from))
|
|
)
|
|
)?;
|
|
|
|
let mut exit_code = main_result?;
|
|
for res in worker_results {
|
|
let ret = res?;
|
|
if ret != 0 && exit_code == 0 {
|
|
exit_code = ret;
|
|
}
|
|
}
|
|
Ok(exit_code)
|
|
}
|
|
|
|
async fn run_worker(
|
|
worker_count: usize,
|
|
worker_factory: Arc<CliMainWorkerFactory>,
|
|
main_module: ModuleSpecifier,
|
|
hmr: bool,
|
|
) -> Result<i32, AnyError> {
|
|
let mut worker: crate::worker::CliMainWorker = worker_factory
|
|
.create_main_worker(
|
|
deno_runtime::WorkerExecutionMode::Serve {
|
|
is_main: false,
|
|
worker_count: Some(worker_count),
|
|
},
|
|
main_module,
|
|
)
|
|
.await?;
|
|
if hmr {
|
|
worker.run_for_watcher().await?;
|
|
Ok(0)
|
|
} else {
|
|
worker.run().await.map_err(Into::into)
|
|
}
|
|
}
|
|
|
|
async fn serve_with_watch(
|
|
flags: Arc<Flags>,
|
|
watch_flags: WatchFlagsWithPaths,
|
|
worker_count: Option<usize>,
|
|
) -> Result<i32, AnyError> {
|
|
let hmr = watch_flags.hmr;
|
|
crate::util::file_watcher::watch_recv(
|
|
flags,
|
|
crate::util::file_watcher::PrintConfig::new_with_banner(
|
|
if watch_flags.hmr { "HMR" } else { "Watcher" },
|
|
"Process",
|
|
!watch_flags.no_clear_screen,
|
|
),
|
|
WatcherRestartMode::Automatic,
|
|
move |flags, watcher_communicator, changed_paths| {
|
|
watcher_communicator.show_path_changed(changed_paths.clone());
|
|
Ok(async move {
|
|
let factory = CliFactory::from_flags_for_watcher(
|
|
flags,
|
|
watcher_communicator.clone(),
|
|
);
|
|
let cli_options = factory.cli_options()?;
|
|
let main_module = cli_options.resolve_main_module()?;
|
|
|
|
maybe_npm_install(&factory).await?;
|
|
|
|
let _ = watcher_communicator.watch_paths(cli_options.watch_paths());
|
|
let worker_factory =
|
|
Arc::new(factory.create_cli_main_worker_factory().await?);
|
|
|
|
do_serve(worker_factory, main_module.clone(), worker_count, hmr)
|
|
.await?;
|
|
|
|
Ok(())
|
|
})
|
|
},
|
|
)
|
|
.boxed_local()
|
|
.await?;
|
|
Ok(0)
|
|
}
|