Replace rocket with axum
This commit is contained in:
parent
7b3f489251
commit
bd21569ab9
3 changed files with 306 additions and 1081 deletions
1258
Cargo.lock
generated
1258
Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
@ -4,5 +4,9 @@ version = "0.1.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
rocket = { version = "0.5.0-rc.2", features = ["json"]}
|
axum = "0.6.20"
|
||||||
serde_json = "1.0.91"
|
serde_json = "1.0.91"
|
||||||
|
tokio = { version = "1.32.0", features = ["macros", "rt", "rt-multi-thread"] }
|
||||||
|
tracing = "0.1.37"
|
||||||
|
serde = { version = "1.0.188", features = ["derive"] }
|
||||||
|
tracing-subscriber = "0.3.17"
|
121
src/main.rs
121
src/main.rs
|
@ -1,50 +1,42 @@
|
||||||
#[macro_use] extern crate rocket;
|
use axum::extract::{Path, State};
|
||||||
|
use axum::{
|
||||||
use std::sync::atomic::Ordering;
|
routing::{get, post},
|
||||||
use std::sync::Mutex;
|
Json, Router,
|
||||||
use rocket::serde::{Deserialize, Serialize, json::Json};
|
};
|
||||||
use rocket::State;
|
use serde::{Deserialize, Serialize};
|
||||||
use rocket::Request;
|
use std::net::SocketAddr;
|
||||||
use rocket::Response;
|
use std::sync::{Arc, Mutex};
|
||||||
use rocket::http::Header;
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
#[serde(crate = "rocket::serde")]
|
|
||||||
struct Page {
|
struct Page {
|
||||||
slug: String,
|
slug: String,
|
||||||
votes: i32
|
votes: i32,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
#[serde(crate = "rocket::serde")]
|
|
||||||
struct VoteRecord {
|
struct VoteRecord {
|
||||||
pages: Vec<Page>
|
pages: Vec<Page>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
struct AppState {
|
struct AppState {
|
||||||
record: Mutex<VoteRecord>
|
record: Arc<Mutex<VoteRecord>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[get("/votes/view/<slug>")]
|
async fn view_votes(State(state): State<AppState>, Path(slug): Path<String>) -> Json<Page> {
|
||||||
fn view_votes(slug: String, state: &State<AppState>) -> Json<Page> {
|
tracing::info!("Requesting votes for {slug}");
|
||||||
println!("Requesting votes for {slug}");
|
|
||||||
|
|
||||||
//Json(state.leaderboard.lock().unwrap().clone())
|
|
||||||
for page in &state.record.lock().unwrap().pages {
|
for page in &state.record.lock().unwrap().pages {
|
||||||
if page.slug == slug {
|
if page.slug == slug {
|
||||||
return Json(page.clone())
|
return Json(page.clone());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return Json(Page {
|
return Json(Page { slug, votes: 0 });
|
||||||
slug,
|
|
||||||
votes: 0
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[post("/votes/submit/<slug>")]
|
async fn leaderboard_submit_score(State(state): State<AppState>, Path(slug): Path<String>) {
|
||||||
fn leaderboard_submit_score(slug: String, state: &State<AppState>) {
|
tracing::info!("Submitting vote for {slug}");
|
||||||
println!("Submitting vote for {slug}");
|
|
||||||
|
|
||||||
let mut found = false;
|
let mut found = false;
|
||||||
for mut page in &mut state.record.lock().unwrap().pages {
|
for mut page in &mut state.record.lock().unwrap().pages {
|
||||||
|
@ -55,61 +47,48 @@ fn leaderboard_submit_score(slug: String, state: &State<AppState>) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if !found {
|
if !found {
|
||||||
state.record.lock().unwrap().pages.push(Page {
|
state
|
||||||
slug,
|
.record
|
||||||
votes: 1
|
.lock()
|
||||||
});
|
.unwrap()
|
||||||
}
|
.pages
|
||||||
|
.push(Page { slug, votes: 1 });
|
||||||
println!("{:#?}", state.record.lock());
|
|
||||||
}
|
|
||||||
|
|
||||||
use rocket::fairing::{Fairing, Info, Kind};
|
|
||||||
|
|
||||||
pub struct CORS;
|
|
||||||
|
|
||||||
#[rocket::async_trait]
|
|
||||||
impl Fairing for CORS {
|
|
||||||
fn info(&self) -> Info {
|
|
||||||
Info {
|
|
||||||
name: "Add CORS headers to responses",
|
|
||||||
kind: Kind::Response
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn on_response<'r>(&self, _request: &'r Request<'_>, response: &mut Response<'r>) {
|
|
||||||
response.set_header(Header::new("Access-Control-Allow-Origin", "*"));
|
|
||||||
response.set_header(Header::new("Access-Control-Allow-Methods", "POST, GET, PATCH, OPTIONS"));
|
|
||||||
response.set_header(Header::new("Access-Control-Allow-Headers", "*"));
|
|
||||||
response.set_header(Header::new("Access-Control-Allow-Credentials", "true"));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[rocket::main]
|
#[tokio::main]
|
||||||
async fn main() -> Result<(), rocket::error::Error> {
|
async fn main() {
|
||||||
|
tracing_subscriber::fmt::init();
|
||||||
|
|
||||||
let initial_state = if let Ok(data) = std::fs::read_to_string("votes.json") {
|
let initial_state = if let Ok(data) = std::fs::read_to_string("votes.json") {
|
||||||
AppState {
|
AppState {
|
||||||
record: Mutex::new(serde_json::from_str(&data).expect("Failed to parse"))
|
record: Arc::new(Mutex::new(
|
||||||
|
serde_json::from_str(&data).expect("Failed to parse"),
|
||||||
|
)),
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
AppState {
|
AppState {
|
||||||
record: Mutex::new(VoteRecord
|
record: Arc::new(Mutex::new(VoteRecord { pages: vec![] })),
|
||||||
{
|
|
||||||
pages: vec![]
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let rocket = rocket::build()
|
let app = Router::new()
|
||||||
.mount("/", routes![view_votes, leaderboard_submit_score])
|
.route("/votes/submit/:slug", post(leaderboard_submit_score))
|
||||||
.manage(initial_state)
|
.route("/votes/view/:slug", get(view_votes))
|
||||||
.attach(CORS)
|
.with_state(initial_state.clone());
|
||||||
.ignite().await?
|
|
||||||
.launch().await?;
|
|
||||||
|
|
||||||
let state = rocket.state::<AppState>().unwrap();
|
let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
|
||||||
|
tracing::info!("Listening on {}", addr);
|
||||||
|
axum::Server::bind(&addr)
|
||||||
|
.serve(app.into_make_service())
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
serde_json::to_writer(&std::fs::File::create("votes.json").unwrap(), &state.record).expect("TODO: panic message");
|
let state_clone = initial_state.clone();
|
||||||
|
let st = state_clone.record.lock().unwrap();
|
||||||
Ok(())
|
serde_json::to_writer(
|
||||||
}
|
&std::fs::File::create("votes.json").unwrap(),
|
||||||
|
&st.to_owned(),
|
||||||
|
)
|
||||||
|
.expect("TODO: panic message");
|
||||||
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue