Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change reqwest dependency against ureq #117

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Change reqwest dependency against ureq #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,23 @@ tar = { version = "0.4", optional = true }
semver = "1.0"
zip = { version = "0.6", default-features = false, features = ["time"], optional = true }
either = { version = "1", optional = true }
reqwest = { version = "0.11", default-features = false, features = ["blocking", "json"] }
hyper = "0.14"
indicatif = "0.17"
quick-xml = "0.23"
regex = "1"
log = "0.4"
urlencoding = "2.1"
self-replace = "1"
ureq = { version = "2.7", default-features = false, features = ["gzip", "json", "native-tls"] }
native-tls = "0.2"
once_cell = "1"

[features]
default = ["reqwest/default-tls"]
default = []
archive-zip = ["zip"]
compression-zip-bzip2 = ["zip/bzip2"] #
compression-zip-deflate = ["zip/deflate"] #
archive-tar = ["tar"]
compression-flate2 = ["flate2", "either"] #
rustls = ["reqwest/rustls-tls"]

[package.metadata.docs.rs]
# Whether to pass `--all-features` to Cargo (default: false)
Expand Down
104 changes: 18 additions & 86 deletions src/backends/gitea.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ gitea releases
use std::env::{self, consts::EXE_SUFFIX};
use std::path::{Path, PathBuf};

use reqwest::{self, header};

use crate::backends::find_rel_next_link;
use crate::update::api_headers;
use crate::{
errors::*,
get_target,
Expand Down Expand Up @@ -154,7 +153,6 @@ impl ReleaseList {
/// Retrieve a list of `Release`s.
/// If specified, filter for those containing a specified `target`
pub fn fetch(self) -> Result<Vec<Release>> {
set_ssl_vars!();
let api_url = format!(
"{}/api/v1/repos/{}/{}/releases",
self.host, self.repo_owner, self.repo_name
Expand All @@ -172,21 +170,17 @@ impl ReleaseList {
}

fn fetch_releases(&self, url: &str) -> Result<Vec<Release>> {
let resp = reqwest::blocking::Client::new()
.get(url)
.headers(api_headers(&self.auth_token)?)
.send()?;
if !resp.status().is_success() {
bail!(
Error::Network,
"api request failed with status: {:?} - for: {:?}",
resp.status(),
url
)
}
let headers = resp.headers().clone();
let resp = crate::get(url, &api_headers(self.auth_token.as_deref())?)?;

// handle paged responses containing `Link` header:
// `Link: <https://gitea.com/api/v4/projects/13083/releases?id=13083&page=2&per_page=20>; rel="next"`
let next_link = resp
.all("link")
.into_iter()
.find_map(|link| find_rel_next_link(link))
.map(|s| s.to_owned());

let releases = resp.json::<serde_json::Value>()?;
let releases = resp.into_json::<serde_json::Value>()?;
let releases = releases
.as_array()
.ok_or_else(|| format_err!(Error::Release, "No releases found"))?;
Expand All @@ -195,25 +189,10 @@ impl ReleaseList {
.map(Release::from_release_gitea)
.collect::<Result<Vec<Release>>>()?;

// handle paged responses containing `Link` header:
// `Link: <https://gitea.com/api/v4/projects/13083/releases?id=13083&page=2&per_page=20>; rel="next"`
let links = headers.get_all(reqwest::header::LINK);

let next_link = links
.iter()
.filter_map(|link| {
if let Ok(link) = link.to_str() {
find_rel_next_link(link)
} else {
None
}
})
.next();

Ok(match next_link {
None => releases,
Some(link) => {
releases.extend(self.fetch_releases(link)?);
releases.extend(self.fetch_releases(&link)?);
releases
}
})
Expand Down Expand Up @@ -472,46 +451,24 @@ impl Update {

impl ReleaseUpdate for Update {
fn get_latest_release(&self) -> Result<Release> {
set_ssl_vars!();
let api_url = format!(
"{}/api/v1/repos/{}/{}/releases",
self.host, self.repo_owner, self.repo_name
);
let resp = reqwest::blocking::Client::new()
.get(&api_url)
.headers(self.api_headers(&self.auth_token)?)
.send()?;
if !resp.status().is_success() {
bail!(
Error::Network,
"api request failed with status: {:?} - for: {:?}",
resp.status(),
api_url
)
}
let json = resp.json::<serde_json::Value>()?;

let req = crate::get(&api_url, &api_headers(self.auth_token.as_deref())?)?;
let json = req.into_json::<serde_json::Value>()?;
Release::from_release_gitea(&json[0])
}

fn get_release_version(&self, ver: &str) -> Result<Release> {
set_ssl_vars!();
let api_url = format!(
"{}/api/v1/repos/{}/{}/releases/{}",
self.host, self.repo_owner, self.repo_name, ver
);
let resp = reqwest::blocking::Client::new()
.get(&api_url)
.headers(self.api_headers(&self.auth_token)?)
.send()?;
if !resp.status().is_success() {
bail!(
Error::Network,
"api request failed with status: {:?} - for: {:?}",
resp.status(),
api_url
)
}
let json = resp.json::<serde_json::Value>()?;

let req = crate::get(&api_url, &api_headers(self.auth_token.as_deref())?)?;
let json = req.into_json::<serde_json::Value>()?;
Release::from_release_gitea(&json)
}

Expand Down Expand Up @@ -562,10 +519,6 @@ impl ReleaseUpdate for Update {
fn auth_token(&self) -> Option<String> {
self.auth_token.clone()
}

fn api_headers(&self, auth_token: &Option<String>) -> Result<header::HeaderMap> {
api_headers(auth_token)
}
}

impl Default for UpdateBuilder {
Expand All @@ -589,24 +542,3 @@ impl Default for UpdateBuilder {
}
}
}

fn api_headers(auth_token: &Option<String>) -> Result<header::HeaderMap> {
let mut headers = header::HeaderMap::new();
headers.insert(
header::USER_AGENT,
"rust-reqwest/self-update"
.parse()
.expect("gitea invalid user-agent"),
);

if let Some(token) = auth_token {
headers.insert(
header::AUTHORIZATION,
format!("token {}", token)
.parse()
.map_err(|err| Error::Config(format!("Failed to parse auth token: {}", err)))?,
);
};

Ok(headers)
}
105 changes: 18 additions & 87 deletions src/backends/github.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
/*!
GitHub releases
*/
use hyper::HeaderMap;
use std::env::{self, consts::EXE_SUFFIX};
use std::path::{Path, PathBuf};

use reqwest::{self, header};

use crate::backends::find_rel_next_link;
use crate::update::api_headers;
use crate::{
errors::*,
get_target,
Expand Down Expand Up @@ -153,7 +151,6 @@ impl ReleaseList {
/// Retrieve a list of `Release`s.
/// If specified, filter for those containing a specified `target`
pub fn fetch(self) -> Result<Vec<Release>> {
set_ssl_vars!();
let api_url = format!(
"{}/repos/{}/{}/releases",
self.custom_url
Expand All @@ -174,21 +171,17 @@ impl ReleaseList {
}

fn fetch_releases(&self, url: &str) -> Result<Vec<Release>> {
let resp = reqwest::blocking::Client::new()
.get(url)
.headers(api_headers(&self.auth_token)?)
.send()?;
if !resp.status().is_success() {
bail!(
Error::Network,
"api request failed with status: {:?} - for: {:?}",
resp.status(),
url
)
}
let headers = resp.headers().clone();
let resp = crate::get(url, &api_headers(self.auth_token.as_deref())?)?;

// handle paged responses containing `Link` header:
// `Link: <https://api.github.com/resource?page=2>; rel="next"`
let next_link = resp
.all("link")
.into_iter()
.find_map(|link| find_rel_next_link(link))
.map(|s| s.to_owned());

let releases = resp.json::<serde_json::Value>()?;
let releases = resp.into_json::<serde_json::Value>()?;
let releases = releases
.as_array()
.ok_or_else(|| format_err!(Error::Release, "No releases found"))?;
Expand All @@ -197,25 +190,10 @@ impl ReleaseList {
.map(Release::from_release)
.collect::<Result<Vec<Release>>>()?;

// handle paged responses containing `Link` header:
// `Link: <https://api.github.com/resource?page=2>; rel="next"`
let links = headers.get_all(reqwest::header::LINK);

let next_link = links
.iter()
.filter_map(|link| {
if let Ok(link) = link.to_str() {
find_rel_next_link(link)
} else {
None
}
})
.next();

Ok(match next_link {
None => releases,
Some(link) => {
releases.extend(self.fetch_releases(link)?);
releases.extend(self.fetch_releases(&link)?);
releases
}
})
Expand Down Expand Up @@ -483,7 +461,6 @@ impl Update {

impl ReleaseUpdate for Update {
fn get_latest_release(&self) -> Result<Release> {
set_ssl_vars!();
let api_url = format!(
"{}/repos/{}/{}/releases/latest",
self.custom_url
Expand All @@ -492,24 +469,13 @@ impl ReleaseUpdate for Update {
self.repo_owner,
self.repo_name
);
let resp = reqwest::blocking::Client::new()
.get(&api_url)
.headers(api_headers(&self.auth_token)?)
.send()?;
if !resp.status().is_success() {
bail!(
Error::Network,
"api request failed with status: {:?} - for: {:?}",
resp.status(),
api_url
)
}
let json = resp.json::<serde_json::Value>()?;

let resp = crate::get(&api_url, &api_headers(self.auth_token.as_deref())?)?;
let json = resp.into_json::<serde_json::Value>()?;
Release::from_release(&json)
}

fn get_release_version(&self, ver: &str) -> Result<Release> {
set_ssl_vars!();
let api_url = format!(
"{}/repos/{}/{}/releases/tags/{}",
self.custom_url
Expand All @@ -519,19 +485,9 @@ impl ReleaseUpdate for Update {
self.repo_name,
ver
);
let resp = reqwest::blocking::Client::new()
.get(&api_url)
.headers(api_headers(&self.auth_token)?)
.send()?;
if !resp.status().is_success() {
bail!(
Error::Network,
"api request failed with status: {:?} - for: {:?}",
resp.status(),
api_url
)
}
let json = resp.json::<serde_json::Value>()?;

let resp = crate::get(&api_url, &api_headers(self.auth_token.as_deref())?)?;
let json = resp.into_json::<serde_json::Value>()?;
Release::from_release(&json)
}

Expand Down Expand Up @@ -586,10 +542,6 @@ impl ReleaseUpdate for Update {
fn auth_token(&self) -> Option<String> {
self.auth_token.clone()
}

fn api_headers(&self, auth_token: &Option<String>) -> Result<HeaderMap> {
api_headers(auth_token)
}
}

impl Default for UpdateBuilder {
Expand All @@ -614,24 +566,3 @@ impl Default for UpdateBuilder {
}
}
}

fn api_headers(auth_token: &Option<String>) -> Result<header::HeaderMap> {
let mut headers = header::HeaderMap::new();
headers.insert(
header::USER_AGENT,
"rust-reqwest/self-update"
.parse()
.expect("github invalid user-agent"),
);

if let Some(token) = auth_token {
headers.insert(
header::AUTHORIZATION,
format!("token {}", token)
.parse()
.map_err(|err| Error::Config(format!("Failed to parse auth token: {}", err)))?,
);
};

Ok(headers)
}
Loading