Merge pull request #851 from charlespierce/attohttpc_with_proxy

Move back to attohttpc, now that it supports proxies

Author: charlespierce

Cargo.lock

@@ -15,4 +15,4 @@ verbatim = "0.1"
 cfg-if = "0.1"
 hyperx = "1.0.0"
 thiserror = "1.0.16"
-reqwest = { version = "0.10", features = ["blocking", "json"] }
+attohttpc = { version = "0.16.0", features = ["json"] }

crates/archive/Cargo.toml

@@ -15,7 +15,7 @@ pub use crate::zip::Zip;
 #[derive(Error, Debug)]
 pub enum ArchiveError {
     #[error("HTTP failure ({0})")]
-    HttpError(::reqwest::StatusCode),
+    HttpError(attohttpc::StatusCode),
 
     #[error("HTTP header '{0}' not found")]
     MissingHeaderError(String),
@@ -27,7 +27,7 @@ pub enum ArchiveError {
     IoError(#[from] std::io::Error),
 
     #[error("{0}")]
-    ReqwestError(#[from] reqwest::Error),
+    AttohttpcError(#[from] attohttpc::Error),
 
     #[error("{0}")]
     ZipError(#[from] zip_rs::result::ZipError),

crates/archive/src/lib.rs

@@ -6,13 +6,13 @@ use std::io::{Read, Seek, SeekFrom};
 use std::path::Path;
 
 use super::{Archive, ArchiveError, Origin};
+use attohttpc::header::HeaderMap;
 use flate2::read::GzDecoder;
 use fs_utils::ensure_containing_dir_exists;
 use hyperx::header::{
     AcceptRanges, ByteRangeSpec, ContentLength, Header, Range, RangeUnit, TypedHeaders,
 };
 use progress_read::ProgressRead;
-use reqwest::blocking::Response;
 use tee::TeeReader;
 
 /// A Node installation tarball.
@@ -29,9 +29,8 @@ pub struct Tarball {
 
 /// Determines the length of an HTTP response's content in bytes, using
 /// the HTTP `"Content-Length"` header.
-fn content_length(response: &Response) -> Result<u64, ArchiveError> {
-    response
-        .headers()
+fn content_length(headers: &HeaderMap) -> Result<u64, ArchiveError> {
+    headers
         .decode::<ContentLength>()
         .ok()
         .map(|v| v.0)
@@ -55,14 +54,14 @@ impl Tarball {
     /// tarball that can be streamed (and that tees its data to a local
     /// file as it streams).
     pub fn fetch(url: &str, cache_file: &Path) -> Result<Box<dyn Archive>, ArchiveError> {
-        let response = reqwest::blocking::get(url)?;
+        let (status, headers, response) = attohttpc::get(url).send()?.split();
 
-        if !response.status().is_success() {
-            return Err(ArchiveError::HttpError(response.status()));
+        if !status.is_success() {
+            return Err(ArchiveError::HttpError(status));
         }
 
-        let compressed_size = content_length(&response)?;
-        let uncompressed_size = if accepts_byte_ranges(&response) {
+        let compressed_size = content_length(&headers)?;
+        let uncompressed_size = if accepts_byte_ranges(&headers) {
             fetch_uncompressed_size(url, compressed_size)
         } else {
             None
@@ -128,18 +127,17 @@ fn unpack_isize(packed: [u8; 4]) -> u64 {
 /// downloading the entire gzip file. For very small files it's unlikely to be
 /// more efficient than simply downloading the entire file up front.
 fn fetch_isize(url: &str, len: u64) -> Result<[u8; 4], ArchiveError> {
-    let client = reqwest::blocking::Client::new();
     let range_header = Range::Bytes(vec![ByteRangeSpec::FromTo(len - 4, len - 1)]);
-    let mut response = client
-        .get(url)
+    let (status, headers, mut response) = attohttpc::get(url)
         .header(Range::header_name(), range_header.to_string())
-        .send()?;
+        .send()?
+        .split();
 
-    if !response.status().is_success() {
-        return Err(ArchiveError::HttpError(response.status()));
+    if !status.is_success() {
+        return Err(ArchiveError::HttpError(status));
     }
 
-    let actual_length = content_length(&response)?;
+    let actual_length = content_length(&headers)?;
 
     if actual_length != 4 {
         return Err(ArchiveError::UnexpectedContentLengthError(actual_length));
@@ -160,9 +158,8 @@ fn load_isize(file: &mut File) -> Result<[u8; 4], ArchiveError> {
     Ok(buf)
 }
 
-fn accepts_byte_ranges(response: &Response) -> bool {
-    response
-        .headers()
+fn accepts_byte_ranges(headers: &HeaderMap) -> bool {
+    headers
         .decode::<AcceptRanges>()
         .ok()
         .map(|v| v.iter().any(|unit| *unit == RangeUnit::Bytes))

crates/archive/src/tarball.rs

@@ -34,10 +34,10 @@ impl Zip {
     /// Initiate fetching of a Node zip archive from the given URL, returning
     /// a `Remote` data source.
     pub fn fetch(url: &str, cache_file: &Path) -> Result<Box<dyn Archive>, ArchiveError> {
-        let mut response = reqwest::blocking::get(url)?;
+        let (status, _, mut response) = attohttpc::get(url).send()?.split();
 
-        if !response.status().is_success() {
-            return Err(ArchiveError::HttpError(response.status()));
+        if !status.is_success() {
+            return Err(ArchiveError::HttpError(status));
         }
 
         {

crates/archive/src/zip.rs

@@ -48,7 +48,7 @@ double-checked-cell = "2.0.2"
 dunce = "1.0.0"
 ci_info = "0.10.0"
 hyperx = "1.0.0"
-reqwest = { version = "0.10", features = ["blocking", "json"] }
+attohttpc = { version = "0.16.0", features = ["json"] }
 chain-map = "0.1.0"
 indexmap = "1.3.2"
 retry = "1.0.0"

crates/volta-core/Cargo.toml

@@ -15,11 +15,12 @@ use crate::session::Session;
 use crate::style::progress_spinner;
 use crate::tool::Node;
 use crate::version::{VersionSpec, VersionTag};
+use attohttpc::header::HeaderMap;
+use attohttpc::Response;
 use cfg_if::cfg_if;
 use fs_utils::ensure_containing_dir_exists;
 use hyperx::header::{CacheControl, CacheDirective, Expires, HttpDate, TypedHeaders};
 use log::debug;
-use reqwest::blocking::Response;
 use semver::{Version, VersionReq};
 
 // ISSUE (#86): Move public repository URLs to config file
@@ -226,8 +227,8 @@ fn read_cached_opt(url: &str) -> Fallible<Option<RawNodeIndex>> {
 }
 
 /// Get the cache max-age of an HTTP reponse.
-fn max_age(response: &reqwest::blocking::Response) -> u32 {
-    if let Ok(cache_control_header) = response.headers().decode::<CacheControl>() {
+fn max_age(headers: &HeaderMap) -> u32 {
+    if let Ok(cache_control_header) = headers.decode::<CacheControl>() {
         for cache_directive in cache_control_header.iter() {
             if let CacheDirective::MaxAge(max_age) = cache_directive {
                 return *max_age;
@@ -249,15 +250,16 @@ fn resolve_node_versions(url: &str) -> Fallible<RawNodeIndex> {
             debug!("Node index cache was not found or was invalid");
             let spinner = progress_spinner(&format!("Fetching public registry: {}", url));
 
-            let response: Response = reqwest::blocking::get(url)
+            let (_, headers, response) = attohttpc::get(url)
+                .send()
                 .and_then(Response::error_for_status)
-                .with_context(registry_fetch_error("Node", url))?;
+                .with_context(registry_fetch_error("Node", url))?
+                .split();
 
-            let expires = if let Ok(expires_header) = response.headers().decode::<Expires>() {
+            let expires = if let Ok(expires_header) = headers.decode::<Expires>() {
                 expires_header.to_string()
             } else {
-                let expiry_date =
-                    SystemTime::now() + Duration::from_secs(max_age(&response).into());
+                let expiry_date = SystemTime::now() + Duration::from_secs(max_age(&headers).into());
                 HttpDate::from(expiry_date).to_string()
             };
 

crates/volta-core/src/tool/node/resolve.rs

@@ -11,10 +11,9 @@ use crate::session::Session;
 use crate::style::progress_spinner;
 use crate::tool::Npm;
 use crate::version::{VersionSpec, VersionTag};
+use attohttpc::header::ACCEPT;
+use attohttpc::Response;
 use log::debug;
-use reqwest::blocking::Client;
-use reqwest::blocking::Response;
-use reqwest::header::ACCEPT;
 use semver::{Version, VersionReq};
 
 pub fn resolve(matching: VersionSpec, session: &mut Session) -> Fallible<Option<Version>> {
@@ -43,9 +42,7 @@ fn fetch_npm_index(hooks: Option<&ToolHooks<Npm>>) -> Fallible<(String, PackageI
     };
 
     let spinner = progress_spinner(&format!("Fetching public registry: {}", url));
-    let http_client = Client::new();
-    let metadata: RawPackageMetadata = http_client
-        .get(&url)
+    let metadata: RawPackageMetadata = attohttpc::get(&url)
         .header(ACCEPT, NPM_ABBREVIATED_ACCEPT_HEADER)
         .send()
         .and_then(Response::error_for_status)

crates/volta-core/src/tool/npm/resolve.rs

@@ -12,10 +12,9 @@ use crate::session::Session;
 use crate::style::progress_spinner;
 use crate::tool::Yarn;
 use crate::version::{parse_version, VersionSpec, VersionTag};
+use attohttpc::header::ACCEPT;
+use attohttpc::Response;
 use log::debug;
-use reqwest::blocking::Client;
-use reqwest::blocking::Response;
-use reqwest::header::ACCEPT;
 use semver::{Version, VersionReq};
 
 pub fn resolve(matching: VersionSpec, session: &mut Session) -> Fallible<Version> {
@@ -73,9 +72,7 @@ fn resolve_semver(matching: VersionReq, hooks: Option<&ToolHooks<Yarn>>) -> Fall
 fn fetch_yarn_index() -> Fallible<(String, PackageIndex)> {
     let url = public_registry_index("yarn");
     let spinner = progress_spinner(&format!("Fetching public registry: {}", url));
-    let http_client = Client::new();
-    let metadata: RawPackageMetadata = http_client
-        .get(&url)
+    let metadata: RawPackageMetadata = attohttpc::get(&url)
         .header(ACCEPT, NPM_ABBREVIATED_ACCEPT_HEADER)
         .send()
         .and_then(Response::error_for_status)
@@ -99,7 +96,8 @@ fn resolve_custom_tag(tag: String) -> Fallible<Version> {
 }
 
 fn resolve_latest_legacy(url: String) -> Fallible<Version> {
-    let response_text = reqwest::blocking::get(&url)
+    let response_text = attohttpc::get(&url)
+        .send()
         .and_then(Response::error_for_status)
         .and_then(Response::text)
         .with_context(|| ErrorKind::YarnLatestFetchError {
@@ -135,7 +133,8 @@ fn resolve_semver_from_registry(matching: VersionReq) -> Fallible<Version> {
 
 fn resolve_semver_legacy(matching: VersionReq, url: String) -> Fallible<Version> {
     let spinner = progress_spinner(&format!("Fetching public registry: {}", url));
-    let releases: RawYarnIndex = reqwest::blocking::get(&url)
+    let releases: RawYarnIndex = attohttpc::get(&url)
+        .send()
         .and_then(Response::error_for_status)
         .and_then(Response::json)
         .with_context(registry_fetch_error("Yarn", &url))?;