vbrandl/yagcdn
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleanup and a bit less heap allocation

Browse Source
This commit is contained in:
Valentin Brandl 2019-08-09 16:19:55 +02:00
parent 16a5ac7553
commit 44cf0c93a2
No known key found for this signature in database
GPG Key ID: 30D341DD34118D7D
2 changed files with 96 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
backend/src/cdn.rs
View File

@ -13,7 +13,7 @@ impl Cloudflare {
&CF_ZONE_IDENT
}
pub(crate) fn dbg<T: Service>(
pub(crate) fn purge_cache<T: Service>(
client: &Client,
file: &str,
) -> impl Future<Item = HttpResponse, Error = Error> {
@ -31,29 +31,23 @@ impl Cloudflare {
.send_json(&payload)
.from_err()
.and_then(|response| HttpResponse::build(response.status()).streaming(response))
}
pub(crate) fn purge_cache<T: Service>(
client: &Client,
file: &str,
) -> impl Future<Item = bool, Error = Error> {
client
.post(format!(
"https://api.cloudflare.com/client/v4/zones/{}/purge_cache",
Self::identifier()
))
.header(header::USER_AGENT, statics::USER_AGENT.as_str())
.header("X-Auth-Email", Self::auth_email())
.header("X-Auth-Key", Self::auth_key())
.content_type("application/json")
.send_json(&CfPurgeRequest::singleton::<T>(file))
.from_err()
.and_then(|mut response| {
response
.json::<CfPurgeResponse>()
.map(|resp| resp.success)
.from_err()
})
// client
// .post(format!(
// "https://api.cloudflare.com/client/v4/zones/{}/purge_cache",
// Self::identifier()
// ))
// .header(header::USER_AGENT, statics::USER_AGENT.as_str())
// .header("X-Auth-Email", Self::auth_email())
// .header("X-Auth-Key", Self::auth_key())
// .content_type("application/json")
// .send_json(&CfPurgeRequest::singleton::<T>(file))
// .from_err()
// .and_then(|mut response| {
// response
// .json::<CfPurgeResponse>()
// .map(|resp| resp.success)
// .from_err()
// })
}
fn auth_key() -> &'static str {
@ -83,7 +77,7 @@ impl CfPurgeRequest {
}
}
#[derive(Deserialize)]
struct CfPurgeResponse {
success: bool,
}
// #[derive(Deserialize)]
// struct CfPurgeResponse {
// success: bool,
// }

99
backend/src/main.rs
View File

@ -35,8 +35,7 @@ use time_cache::{Cache, CacheResult};
fn proxy_file<T: Service>(
client: web::Data<Client>,
data: web::Path<FilePath>,
) -> Box<dyn Future<Item = HttpResponse, Error = Error>> {
Box::new(
) -> impl Future<Item = HttpResponse, Error = Error> {
client
.get(&T::raw_url(
&data.user,
@ -59,8 +58,7 @@ fn proxy_file<T: Service>(
.streaming(response))
}
code => Ok(HttpResponse::build(code).finish()),
}),
)
})
}
fn redirect<T: Service>(
@ -109,18 +107,6 @@ fn redirect<T: Service>(
)
}
fn handle_request<T: Service>(
client: web::Data<Client>,
cache: web::Data<State>,
data: web::Path<FilePath>,
) -> Box<dyn Future<Item = HttpResponse, Error = Error>> {
if data.commit.len() == 40 {
proxy_file::<T>(client, data)
} else {
redirect::<T>(client, cache, data)
}
}
fn serve_gist(
client: web::Data<Client>,
data: web::Path<FilePath>,
@ -160,19 +146,12 @@ fn favicon32() -> HttpResponse {
.body(FAVICON)
}
fn purge_cache<T: 'static + Service>(
client: web::Data<Client>,
fn purge_local_cache<T: 'static + Service>(
cache: web::Data<State>,
data: web::Path<FilePath>,
) -> Box<dyn Future<Item = HttpResponse, Error = Error>> {
if data.commit.len() == 40 {
Box::new(
Cloudflare::purge_cache::<T>(&client, &data.path())
.map(|success| HttpResponse::Ok().body(success.to_string())),
)
} else {
) -> impl Future<Item = HttpResponse, Error = Error> {
let cache = cache.clone();
Box::new(futures::future::ok(()).map(move |_| {
futures::future::ok(()).map(move |_| {
if let Ok(mut cache) = cache.write() {
let key = data.to_key::<T>();
cache.invalidate(&key);
@ -180,29 +159,15 @@ fn purge_cache<T: 'static + Service>(
} else {
HttpResponse::InternalServerError().finish()
}
}))
}
})
}
fn dbg<T: 'static + Service>(
fn purge_cf_cache<T: 'static + Service>(
client: web::Data<Client>,
cache: web::Data<State>,
data: web::Path<FilePath>,
) -> Box<dyn Future<Item = HttpResponse, Error = Error>> {
if data.commit.len() == 40 {
Box::new(Cloudflare::dbg::<T>(&client, &data.path()))
} else {
let cache = cache.clone();
Box::new(futures::future::ok(()).map(move |_| {
if let Ok(mut cache) = cache.write() {
let key = data.to_key::<T>();
cache.invalidate(&key);
HttpResponse::Ok().finish()
} else {
HttpResponse::InternalServerError().finish()
}
}))
}
) -> impl Future<Item = HttpResponse, Error = Error> {
Cloudflare::purge_cache::<T>(&client, &data.path())
// .map(|success| HttpResponse::Ok().body(success.to_string()))
}
fn main() -> Result<()> {
@ -219,33 +184,57 @@ fn main() -> Result<()> {
.wrap(middleware::NormalizePath)
.service(favicon32)
.route(
"/github/{user}/{repo}/{commit}/{file:.*}",
web::get().to_async(handle_request::<Github>),
"/github/{user}/{repo}/{commit:[0-9a-fA-F]{40}}/{file:.*}",
web::get().to_async(proxy_file::<Github>),
)
.route(
"/github/{user}/{repo}/{commit}/{file:.*}",
web::delete().to_async(dbg::<Github>),
web::get().to_async(redirect::<Github>),
)
.route(
"/github/{user}/{repo}/{commit:[0-9a-fA-F]{40}}/{file:.*}",
web::delete().to_async(purge_cf_cache::<Github>),
)
.route(
"/github/{user}/{repo}/{commit}/{file:.*}",
web::delete().to_async(purge_local_cache::<Github>),
)
.route(
"/bitbucket/{user}/{repo}/{commit:[0-9a-fA-F]{40}}/{file:.*}",
web::get().to_async(proxy_file::<Bitbucket>),
)
.route(
"/bitbucket/{user}/{repo}/{commit}/{file:.*}",
web::get().to_async(handle_request::<Bitbucket>),
web::get().to_async(redirect::<Bitbucket>),
)
.route(
"/bitbucket/{user}/{repo}/{commit:[0-9a-fA-F]{40}}/{file:.*}",
web::delete().to_async(purge_cf_cache::<Bitbucket>),
)
.route(
"/bitbucket/{user}/{repo}/{commit}/{file:.*}",
web::delete().to_async(dbg::<Bitbucket>),
web::delete().to_async(purge_local_cache::<Bitbucket>),
)
.route(
"/gitlab/{user}/{repo}/{commit:[0-9a-fA-F]{40}}/{file:.*}",
web::get().to_async(proxy_file::<GitLab>),
)
.route(
"/gitlab/{user}/{repo}/{commit}/{file:.*}",
web::get().to_async(handle_request::<GitLab>),
web::get().to_async(redirect::<GitLab>),
)
.route(
"/gitlab/{user}/{repo}/{commit:[0-9a-fA-F]{40}}/{file:.*}",
web::delete().to_async(purge_cf_cache::<GitLab>),
)
.route(
"/gitlab/{user}/{repo}/{commit}/{file:.*}",
web::delete().to_async(purge_cf_cache::<GitLab>),
)
.route(
"/gist/{user}/{repo}/{commit}/{file:.*}",
web::get().to_async(serve_gist),
)
.route(
"/gitlab/{user}/{repo}/{commit}/{file:.*}",
web::delete().to_async(dbg::<GitLab>),
)
.service(actix_files::Files::new("/", "./public").index_file("index.html"))
})
.workers(OPT.workers)