FreakU
/
emojos
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove lambda support; update deps

This commit is contained in:
iliana etaoin 2023-04-05 20:58:21 -07:00
parent ffe33b36e5
commit 0a3de049b4
4 changed files with 417 additions and 821 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1156
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

5
Cargo.toml
View File

@ -11,10 +11,9 @@ include = ["/build.rs", "/src", "/static", "/templates", "/LICENSE", ".gitignore
[dependencies] [dependencies]
anyhow = "1" anyhow = "1"
askama = "0.11" askama = { version = "0.12", default-features = false }
lambda_http = "0.7"
reqwest = { version = "0.11", features = ["gzip", "brotli", "deflate", "json"] } reqwest = { version = "0.11", features = ["gzip", "brotli", "deflate", "json"] }
rocket = { version = "0.5.0-rc.2", default-features = false } rocket = { version = "0.5.0-rc.3", default-features = false }
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
tokio = { version = "1", features = ["rt-multi-thread"] } tokio = { version = "1", features = ["rt-multi-thread"] }

5
src/app.rs
View File

@ -1,3 +1,8 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
#![warn(clippy::pedantic)]
#![allow(clippy::needless_pass_by_value, clippy::no_effect_underscore_binding)]
use askama::Template; use askama::Template;
use reqwest::{Client, StatusCode, Url}; use reqwest::{Client, StatusCode, Url};
use rocket::form::{Form, FromForm}; use rocket::form::{Form, FromForm};

72
src/main.rs
View File

@ -1,75 +1,11 @@
// Copyright (c) 2022 iliana etaoin
// SPDX-License-Identifier: AGPL-3.0-or-later // SPDX-License-Identifier: AGPL-3.0-or-later
#![warn(clippy::pedantic)] #![warn(clippy::pedantic)]
#![allow( #![allow(clippy::no_effect_underscore_binding)]
clippy::map_unwrap_or,
clippy::needless_pass_by_value,
clippy::no_effect_underscore_binding
)]
mod app; mod app;
use anyhow::{anyhow, Context, Result}; #[rocket::launch]
use lambda_http::{http, service_fn, Body}; fn rocket() -> _ {
use rocket::http::Header; app::rocket()
use rocket::local::asynchronous::Client;
fn main() {
// Rocket needs its own async runtime, but that runtime doesn't support the !Send lambda_http
// future.
if std::env::var_os("AWS_LAMBDA_RUNTIME_API").is_some() {
tokio::runtime::Builder::new_multi_thread()
.enable_all()
.build()
.unwrap()
.block_on(async {
let client = Client::untracked(app::rocket()).await.unwrap();
lambda_http::run(service_fn(|request| async {
anyhow::Ok(handler(request, &client).await?)
}))
.await
.unwrap();
});
} else {
rocket::execute(async {
app::rocket().launch().await.ok();
});
}
}
async fn handler(request: http::Request<Body>, client: &Client) -> Result<http::Response<Body>> {
let mut local_request = client.req(
request
.method()
.to_string()
.parse()
.map_err(|()| anyhow!("invalid method"))?,
request
.uri()
.path_and_query()
.context("request has no path")?
.as_str(),
);
for (name, value) in request.headers() {
local_request.add_header(Header::new(
name.as_str().to_owned(),
value.to_str()?.to_owned(),
));
}
let local_response = local_request.body(request.body()).dispatch().await;
let mut response = http::Response::builder().status(local_response.status().code);
for header in local_response.headers().iter() {
let name: &str = header.name.as_ref();
let value: &str = header.value.as_ref();
response = response.header(name, value);
}
Ok(response.body(
local_response
.into_bytes()
.await
.map(Body::Binary)
.unwrap_or(Body::Empty),
)?)
} }