stephenseo/EN605.607.81.SP22_ASDM_Project
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Impl being able to debug locally

Browse source 
CORS (Cross-Origin Resource Sharing) prevented the application's
networked (multiplayer) support from working locally. The
debug_local_testing branch has changes to allow running the game
locally. The backend must be run with `cargo run --release` or `cargo
run`, and the frontend must be run with `trunk serve`, and the
browser(s) must open `http://localhost:8080/`.
This commit is contained in:
Stephen Seo 2022-09-20 19:26:50 +09:00
parent 2d7c8c37e5
commit 72b63aeee1
2 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
back_end/src/main.rs
View file

@ -45,8 +45,9 @@ async fn main() {
start_db_handler_thread(db_rx, SQLITE_DB_PATH.into(), s_helper_tx.clone()); start_db_handler_thread(db_rx, SQLITE_DB_PATH.into(), s_helper_tx.clone());
let route = warp::body::content_length_limit(1024 * 32) let route = //warp::body::content_length_limit(1024 * 32)
.and(warp::body::bytes()) //.and(warp::body::bytes())
warp::body::bytes()
.and_then(move |bytes: bytes::Bytes| { .and_then(move |bytes: bytes::Bytes| {
let db_tx_clone = db_tx_clone.clone(); let db_tx_clone = db_tx_clone.clone();
let s_helper_tx_clone = s_helper_tx.clone(); let s_helper_tx_clone = s_helper_tx.clone();
@ -55,24 +56,48 @@ async fn main() {
if let Ok(body_str) = body_str_result { if let Ok(body_str) = body_str_result {
let json_result = serde_json::from_str(body_str); let json_result = serde_json::from_str(body_str);
if let Ok(json_value) = json_result { if let Ok(json_value) = json_result {
Ok(warp::reply::with_header( let reply = warp::reply::with_header(
json_handlers::handle_json(json_value, db_tx_clone, s_helper_tx_clone) json_handlers::handle_json(json_value, db_tx_clone, s_helper_tx_clone)
.unwrap_or_else(|e| e), .unwrap_or_else(|e| e),
"Content-Type", "Content-Type",
"application/json", "application/json",
);
let reply = warp::reply::with_header(
reply,
"Access-Control-Allow-Headers",
"*",
);
Ok::<Box<dyn warp::reply::Reply>, Rejection>(Box::new(
warp::reply::with_header(reply, "Access-Control-Allow-Origin", "*"),
)) ))
} else { } else {
Ok(warp::reply::with_header( let reply = warp::reply::with_header(
String::from("{\"type\": \"invalid_syntax\"}"), String::from("{\"type\": \"invalid_syntax\"}"),
"Content-Type", "Content-Type",
"application/json", "application/json",
);
let reply = warp::reply::with_header(
reply,
"Access-Control-Allow-Headers",
"*",
);
Ok::<Box<dyn warp::reply::Reply>, Rejection>(Box::new(
warp::reply::with_header(reply, "Access-Control-Allow-Origin", "*"),
)) ))
} }
} else { } else {
Ok::<warp::reply::WithHeader<String>, Rejection>(warp::reply::with_header( let reply = warp::reply::with_header(
String::from("{\"type\": \"invalid_syntax\"}"), String::from("{\"type\": \"invalid_syntax\"}"),
"Content-Type", "Content-Type",
"application/json", "application/json",
);
let reply = warp::reply::with_header(
reply,
"Access-Control-Allow-Headers",
"*",
);
Ok::<Box<dyn warp::reply::Reply>, Rejection>(Box::new(
warp::reply::with_header(reply, "Access-Control-Allow-Origin", "*"),
)) ))
} }
} }

2
front_end/src/constants.rs
View file

@ -37,7 +37,7 @@ pub const BACKEND_PHRASE_MAX_LENGTH: usize = 128;
// TODO: Change this to "https://asdm.seodisparate.com/api" when backend is installed // TODO: Change this to "https://asdm.seodisparate.com/api" when backend is installed
#[allow(dead_code)] #[allow(dead_code)]
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
pub const BACKEND_URL: &str = "http://testlocalhost/api"; pub const BACKEND_URL: &str = "http://localhost:1237/";
#[allow(dead_code)] #[allow(dead_code)]
#[cfg(not(debug_assertions))] #[cfg(not(debug_assertions))]