Fix request

4 files changed, 26 insertions, 8 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 6281cae..4fff158 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1759,6 +1759,7 @@ name = "teleia"
 version = "0.1.0"
 dependencies = [
  "bimap",
+ "bytes",
  "console_error_panic_hook",
  "console_log",
  "enum-map",
diff --git a/Cargo.toml b/Cargo.toml
index 804b553..67ea1f8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,6 +34,7 @@ js-sys = "*" # browser APIs to interact with JS runtime (e.g. run WASM)
 enum-map = "*" # fast maps with enums as keys
 bimap = "*" # bijective maps
 reqwest = "*" # http requests
+bytes = "*" # bytes for http responses
 
 [dependencies.web-sys] # common browser APIs
 version = "*"
diff --git a/src/lib.rs b/src/lib.rs
index f860dc2..41bfee8 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -125,7 +125,11 @@ where
                         match std::future::Future::poll(f.as_mut(), &mut st.waker_ctx) {
                             std::task::Poll::Pending => {},
                             std::task::Poll::Ready(res) => {
-                                st.request_returned(&ctx, game, res);
+                                st.request = None;
+                                match res {
+                                    Ok(r) => st.request_returned(&ctx, game, r),
+                                    Err(e) => log::warn!("error during HTTP request: {}", e),
+                                }
                             },
                         }
                         // f.poll();
diff --git a/src/state.rs b/src/state.rs
index 89d1a13..8c70c51 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -8,7 +8,6 @@ use crate::{context, framebuffer, shader, audio};
 const DELTA_TIME: f64 = 1.0 / 60.0;
 
 pub struct WinitWaker {}
-
 impl WinitWaker {
     fn new() -> Self { Self {} }
 }
@@ -16,6 +15,12 @@ impl std::task::Wake for WinitWaker {
     fn wake(self: std::sync::Arc<Self>) {}
 }
 
+pub struct Response {
+    pub url: String,
+    pub status: reqwest::StatusCode,
+    pub body: bytes::Bytes,
+}
+
 pub trait Game {
     fn initialize_audio(&self, ctx: &context::Context, st: &State, actx: &audio::Context) ->
         HashMap<String, audio::Audio>
@@ -25,7 +30,7 @@ pub trait Game {
     fn finish_title(&mut self, st: &mut State) {}
     fn mouse_move(&mut self, ctx: &context::Context, st: &mut State, x: i32, y: i32) {}
     fn mouse_press(&mut self, ctx: &context::Context, st: &mut State) {}
-    fn request_return(&mut self, ctx: &context::Context, st: &mut State, res: reqwest::Response) {}
+    fn request_return(&mut self, ctx: &context::Context, st: &mut State, res: Response) {}
     fn update(&mut self, ctx: &context::Context, st: &mut State) -> Option<()> { Some(()) }
     fn render(&mut self, ctx: &context::Context, st: &mut State) -> Option<()> { Some(()) }
 }
@@ -109,7 +114,7 @@ pub struct State {
 
     pub waker_ctx: std::task::Context<'static>,
     pub http_client: reqwest::Client,
-    pub request: Option<std::pin::Pin<Box<dyn std::future::Future<Output = reqwest::Response>>>>,
+    pub request: Option<std::pin::Pin<Box<dyn std::future::Future<Output = reqwest::Result<Response>>>>>,
 
     pub log: Vec<(u64, String)>,
 }
@@ -388,23 +393,30 @@ impl State {
         self.rebinding = Some(*k);
     }
 
-    pub fn request<F>(&mut self, ctx: &context::Context, f: F)
+    pub fn request<F>(&mut self, f: F)
     where F: Fn(&reqwest::Client) -> reqwest::RequestBuilder
     {
         let builder = f(&self.http_client);
         let fut = async {
-            builder.send().await.expect("failed to send HTTP request")
+            let resp = builder.send().await?;
+            let url = resp.url().clone().to_string();
+            let status = resp.status().clone();
+            let body = resp.bytes().await?;
+            reqwest::Result::Ok(Response {
+                url,
+                status,
+                body,
+            })
         };
         self.request = Some(Box::pin(fut));
     }
 
     pub fn requesting(&self) -> bool { self.request.is_some() }
 
-    pub fn request_returned<G>(&mut self, ctx: &context::Context, game: &mut G, res: reqwest::Response)
+    pub fn request_returned<G>(&mut self, ctx: &context::Context, game: &mut G, res: Response)
     where G: Game
     {
         game.request_return(ctx, self, res);
-        self.request = None;
     }
 
     pub fn run_update<G>(&mut self, ctx: &context::Context, game: &mut G) where G: Game {