a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2025-01-06 22:47:48 +03:00
Code Issues Projects Releases Wiki Activity

Get the HTTP POST working on wasm too

Browse Source
This commit is contained in:
Dustin Carlino 2021-08-16 14:22:57 -07:00
parent 01fbfd37ae
commit 090256668e
4 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
abstio/Cargo.toml
View File

@ -11,12 +11,12 @@ bincode = "1.3.1"
instant = "0.1.7" instant = "0.1.7"
lazy_static = "1.4.0" lazy_static = "1.4.0"
log = "0.4.14" log = "0.4.14"
reqwest = { version = "0.11.0", default-features=false, features=["rustls-tls"] }
serde = "1.0.123" serde = "1.0.123"
serde_json = "1.0.61" serde_json = "1.0.61"
[target.'cfg(not(target_arch = "wasm32"))'.dependencies] [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
futures-channel = { version = "0.3.12"} futures-channel = { version = "0.3.12"}
reqwest = { version = "0.11.0", default-features=false, features=["rustls-tls"] }
tokio = "1.1.1" tokio = "1.1.1"
[target.'cfg(target_arch = "wasm32")'.dependencies] [target.'cfg(target_arch = "wasm32")'.dependencies]

15
abstio/src/http_post.rs Normal file
View File

@ -0,0 +1,15 @@
use anyhow::Result;
/// Performs an HTTP POST request and returns the respone.
pub async fn http_post<I: AsRef<str>>(url: I, body: String) -> Result<String> {
let url = url.as_ref();
info!("HTTP POST to {}", url);
let resp = reqwest::Client::new()
.post(url)
.body(body)
.send()
.await?
.text()
.await?;
Ok(resp)
}

2
abstio/src/lib.rs
View File

@ -25,9 +25,11 @@ pub use download::*;
pub use abst_data::*; pub use abst_data::*;
pub use abst_paths::*; pub use abst_paths::*;
pub use http_post::*;
mod abst_data; mod abst_data;
mod abst_paths; mod abst_paths;
mod http_post;
mod io; mod io;
/// An adapter for widgetry::Settings::read_svg to read SVGs using this crate's methods for finding /// An adapter for widgetry::Settings::read_svg to read SVGs using this crate's methods for finding

8
game/src/ungap/mod.rs
View File

@ -410,16 +410,14 @@ fn make_legend(ctx: &mut EventCtx, app: &App, elevation: bool, nearby: bool) ->
fn share_proposal(ctx: &mut EventCtx, app: &App) -> Box<dyn State<App>> { fn share_proposal(ctx: &mut EventCtx, app: &App) -> Box<dyn State<App>> {
let (_, outer_progress_rx) = futures_channel::mpsc::channel(1); let (_, outer_progress_rx) = futures_channel::mpsc::channel(1);
let (mut inner_progress_tx, inner_progress_rx) = futures_channel::mpsc::channel(1); let (_, inner_progress_rx) = futures_channel::mpsc::channel(1);
let edits_json = let edits_json =
abstutil::to_json_terse(&app.primary.map.get_edits().to_permanent(&app.primary.map)); abstutil::to_json_terse(&app.primary.map.get_edits().to_permanent(&app.primary.map));
let url = "http://localhost:8080/create"; let url = "http://localhost:8080/v1/create";
FutureLoader::<App, String>::new_state( FutureLoader::<App, String>::new_state(
ctx, ctx,
Box::pin(async move { Box::pin(async move {
let raw_bytes = let uuid = abstio::http_post(url, edits_json).await?;
abstio::download_bytes(url, Some(edits_json), &mut inner_progress_tx).await?;
let uuid = String::from_utf8(raw_bytes)?;
// TODO I'm so lost in this type magic // TODO I'm so lost in this type magic
let wrapper: Box<dyn Send + FnOnce(&App) -> String> = Box::new(move |_| uuid); let wrapper: Box<dyn Send + FnOnce(&App) -> String> = Box::new(move |_| uuid);
Ok(wrapper) Ok(wrapper)