Fetcher http flag

kflansburg · Mar 15, 2024 · Mar 12, 2024 · Mar 12, 2024 · Mar 12, 2024 · Mar 12, 2024
commit 99970ca06eeff90ac48028e9287bc883f01414cd
@@ -688,14 +688,14 @@ pub async fn main(
         })
         .get_async("/remote-by-request", |req, ctx| async move {
             let fetcher = ctx.service("remote")?;
-            fetcher.fetch_request(req).await
+            fetcher.fetch_request(req.into()).await.map(|r| r.into())
         })
         .get_async("/remote-by-path", |req, ctx| async move {
             let fetcher = ctx.service("remote")?;
             let mut init = RequestInit::new();
             init.with_method(Method::Post);
 
-            fetcher.fetch(req.url()?.to_string(), Some(init)).await
+            fetcher.fetch(req.url()?.to_string(), Some(init)).await.map(|r| r.into())
         })
         .post_async("/queue/send/:id", |_req, ctx| async move {
             let id = match ctx.param("id").map(|id|Uuid::try_parse(id).ok()).and_then(|u|u) {

@@ -1,34 +1,53 @@
 use wasm_bindgen::{JsCast, JsValue};
 use wasm_bindgen_futures::JsFuture;
 
-use crate::{env::EnvBinding, Request, RequestInit, Response, Result};
+use crate::{env::EnvBinding, RequestInit, Result};
 
+#[cfg(feature = "http")]
+use crate::{HttpRequest, HttpResponse};
+#[cfg(not(feature = "http"))]
+use crate::{Request, Response};
 /// A struct for invoking fetch events to other Workers.
 pub struct Fetcher(worker_sys::Fetcher);
 
+#[cfg(not(feature = "http"))]
+type FetchResponseType = Response;
+#[cfg(feature = "http")]
+type FetchResponseType = HttpResponse;
+
 impl Fetcher {
     /// Invoke a fetch event in a worker with a url and optionally a [RequestInit].
     pub async fn fetch(
         &self,
         url: impl Into<String>,
         init: Option<RequestInit>,
-    ) -> Result<Response> {
+    ) -> Result<FetchResponseType> {
         let path = url.into();
         let promise = match init {
             Some(ref init) => self.0.fetch_with_str_and_init(&path, &init.into()),
             None => self.0.fetch_with_str(&path),
         };
 
         let resp_sys: web_sys::Response = JsFuture::from(promise).await?.dyn_into()?;
-        Ok(Response::from(resp_sys))
+        #[cfg(not(feature = "http"))]
+        let result = Ok(Response::from(resp_sys));
+        #[cfg(feature = "http")]
+        let result = Ok(crate::response_from_wasm(resp_sys));
+        result
     }
 
     /// Invoke a fetch event with an existing [Request].
+    #[cfg(not(feature = "http"))]
     pub async fn fetch_request(&self, request: Request) -> Result<Response> {
         let promise = self.0.fetch(request.inner());
         let resp_sys: web_sys::Response = JsFuture::from(promise).await?.dyn_into()?;
         Ok(Response::from(resp_sys))
     }
+
+    #[cfg(feature = "http")]
+    pub async fn fetch_request(&self, _request: HttpRequest) -> Result<HttpResponse> {
+        todo!()
+    }
 }
 
 impl EnvBinding for Fetcher {

@@ -3,3 +3,7 @@ use crate::http::body::Body;
 pub fn from_wasm(_req: web_sys::Request) -> http::Request<Body> {
     todo!()
 }
+
+pub fn to_wasm(_req: http::Request<Body>) -> web_sys::Request {
+    todo!()
+}
@@ -3,3 +3,7 @@ use crate::http::body::Body;
 pub fn to_wasm(_resp: http::Response<Body>) -> web_sys::Response {
     todo!()
 }
+
+pub fn from_wasm(_resp: web_sys::Response) -> http::Response<Body> {
+    todo!()
+}
@@ -84,6 +84,9 @@ mod websocket;
 pub type Result<T> = StdResult<T, error::Error>;
 
 pub use http::body::Body;
-pub use http::{request::from_wasm as request_from_wasm, response::to_wasm as response_to_wasm};
+pub use http::{
+    request::from_wasm as request_from_wasm, request::to_wasm as request_to_wasm,
+    response::from_wasm as response_from_wasm, response::to_wasm as response_to_wasm,
+};
 pub type HttpRequest = ::http::Request<http::body::Body>;
 pub type HttpResponse = ::http::Response<http::body::Body>;
@@ -31,6 +31,13 @@ impl From<crate::HttpRequest> for Request {
     }
 }
 
+#[cfg(feature = "http")]
+impl From<Request> for crate::HttpRequest {
+    fn from(_req: Request) -> Self {
+        todo!()
+    }
+}
+
 impl From<web_sys::Request> for Request {
     fn from(req: web_sys::Request) -> Self {
         Self {
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,3 +3,7 @@ use crate::http::body::Body; @@
     pub fn from_wasm(_req: web_sys::Request) -> http::Request<Body> {
         todo!()
     }
+    pub fn to_wasm(_req: http::Request<Body>) -> web_sys::Request {
+        todo!()
+    }