yetangitu/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2025-10-04 10:19:27 +02:00
Code Issues Releases Wiki Activity

Add support for http proxy

Browse source 
Currently only http proxy (no https) is supported.
This commit is contained in:
Johan Anderholm 2018-03-23 06:15:15 +01:00
parent 612978908f
commit 3bdc5e0073
8 changed files with 170 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

29
core/src/apresolve.rs
View file

@ -1,7 +1,7 @@
const AP_FALLBACK: &'static str = "ap.spotify.com:80";
const AP_FALLBACK: &'static str = "ap.spotify.com:443";
const APRESOLVE_ENDPOINT: &'static str = "http://apresolve.spotify.com/";
use futures::{Future, Stream};
use futures::{future, Future, Stream};
use hyper::{self, Client, Uri};
use serde_json;
use std::str::FromStr;
@ -40,15 +40,24 @@ fn apresolve(handle: &Handle) -> Box<Future<Item = String, Error = Error>> {
Box::new(ap)
}
pub(crate) fn apresolve_or_fallback<E>(handle: &Handle) -> Box<Future<Item = String, Error = E>>
pub(crate) fn apresolve_or_fallback<E>(
handle: &Handle,
proxy: &Option<String>,
) -> Box<Future<Item = String, Error = E>>
where
E: 'static,
{
let ap = apresolve(handle).or_else(|e| {
warn!("Failed to resolve Access Point: {}", e.description());
warn!("Using fallback \"{}\"", AP_FALLBACK);
Ok(AP_FALLBACK.into())
});
Box::new(ap)
if proxy.is_some() {
// TODO: Use a proper proxy library and filter out a 443 proxy instead of relying on fallback.
// The problem with current libraries (hyper-proxy, reqwest) is that they depend on TLS
// and this is a dependency we might not want.
Box::new(future::result(Ok(AP_FALLBACK.into())))
} else {
let ap = apresolve(handle).or_else(|e| {
warn!("Failed to resolve Access Point: {}", e.description());
warn!("Using fallback \"{}\"", AP_FALLBACK);
Ok(AP_FALLBACK.into())
});
Box::new(ap)
}
}