Don't bypass the cache when retrieving metadata

Author: arcanis

packages/zpm/src/commands/debug/bench.rs

@@ -174,13 +174,13 @@ impl BenchRun {
         let hyperfine_args = vec![
             "--min-runs=30".to_string(),
             "--warmup=4".to_string(),
-            "--show-output".to_string(),
             format!("--export-json={bench_json_string}"),
             format!("--prepare={current_exec_string} debug bench {mode_string} --cleanup"),
             format!("{current_exec_string} debug bench {mode_string} --iteration"),
         ];
 
         ScriptEnvironment::new()?
+            .enable_shell_forwarding()
             .with_cwd(temp_directory)
             .run_exec("hyperfine", hyperfine_args)
             .await?

packages/zpm/src/fetchers/npm.rs

@@ -65,7 +65,7 @@ pub async fn fetch_locator<'a>(context: &InstallContext<'a>, locator: &Locator,
 
     let cached_blob = package_cache.ensure_blob(locator.clone(), ".zip", || async {
         let bytes
-            = http_npm::get(&http_npm::NpmHttpParams {
+            = http_npm::get_raw(&http_npm::NpmHttpParams {
                 http_client: &project.http_client,
                 registry: &registry_base,
                 path: &registry_path,

packages/zpm/src/http.rs

@@ -363,7 +363,7 @@ impl HttpClient {
     /// Performs a cached GET request. If the URL has already been fetched,
     /// returns the cached response bytes. Concurrent requests to the same URL
     /// will wait for the first request to complete and share the result.
-    pub async fn cached_get(&self, url: impl AsRef<str>) -> Result<Bytes, Error> {
+    pub async fn cached_get(&self, url: impl AsRef<str>, headers: Option<HeaderMap>) -> Result<Bytes, Error> {
         let url_str
             = url.as_ref().to_string();
 
@@ -374,7 +374,8 @@ impl HttpClient {
 
         let result = cell.get_or_init(|| async {
             let request
-                = self.get(&url_str)?;
+                = self.get(&url_str)?
+                    .add_headers(headers);
 
             let result
                 = request.send().await?;

packages/zpm/src/http_npm.rs

@@ -274,24 +274,48 @@ pub async fn get(params: &NpmHttpParams<'_>) -> Result<Bytes, Error> {
     let url
         = format!("{}{}", params.registry, params.path);
 
-    let bytes = match params.authorization {
-        Some(authorization) => {
-            params.http_client.get(&url)?
-                .header("accept", Some("application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*"))
-                .header("authorization", Some(authorization))
-                .send().await?
-                .error_for_status()?
-                .bytes().await?
-        },
+    let mut headers
+        = http::HeaderMap::new();
+
+    headers.insert(
+        http::header::ACCEPT,
+        http::HeaderValue::from_static("application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*"),
+    );
+
+    if let Some(authorization) = params.authorization {
+        headers.insert(
+            http::header::AUTHORIZATION,
+            http::HeaderValue::from_str(authorization).unwrap(),
+        );
+    }
 
-        None => {
-            params.http_client.get(&url)?
-                .header("accept", Some("application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*"))
-                .send().await?
-                .error_for_status()?
-                .bytes().await?
-        },
-    };
+    let bytes
+        = params.http_client.cached_get(&url, Some(headers)).await?;
+
+    Ok(bytes)
+}
+
+pub async fn get_raw(params: &NpmHttpParams<'_>) -> Result<Bytes, Error> {
+    let url
+        = format!("{}{}", params.registry, params.path);
+
+    let mut headers
+        = http::HeaderMap::new();
+
+    if let Some(authorization) = params.authorization {
+        headers.insert(
+            http::header::AUTHORIZATION,
+            http::HeaderValue::from_str(authorization).unwrap(),
+        );
+    }
+
+    let bytes
+        = params.http_client.get(&url)?
+            .add_headers(Some(headers))
+            .send()
+            .await?
+            .error_for_status()?
+            .bytes().await?;
 
     Ok(bytes)
 }