Skip to content

refactor: make Body an associated type on ProxyBackend #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alukach merged 1 commit into from
May 21, 2026
Merged

refactor: make Body an associated type on ProxyBackend #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions crates/cf-workers/src/backend.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,14 @@ pub struct WorkerBackend;

impl ProxyBackend for WorkerBackend {
type ResponseBody = web_sys::Response;
type Body = JsBody;

async fn forward<Body: 'static>(
async fn forward(
&self,
request: ForwardRequest,
body: Body,
body: JsBody,
) -> Result<ForwardResponse<Self::ResponseBody>, ProxyError> {
// Downcast to the concrete JsBody type used by the Workers runtime.
let any_body: Box<dyn std::any::Any> = Box::new(body);
let js_body = any_body
.downcast::<JsBody>()
.map_err(|_| ProxyError::Internal("unexpected body type".into()))?;
let js_body = body;

// Build web_sys::RequestInit.
let init = web_sys::RequestInit::new();
Expand Down
7 changes: 5 additions & 2 deletions crates/core/src/backend/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,15 @@ pub trait ProxyBackend: Clone + MaybeSend + MaybeSync + 'static {
/// The streaming body type in forwarded backend responses.
type ResponseBody: MaybeSend + 'static;

/// The request body type accepted by [`forward()`](Self::forward).
type Body: MaybeSend + 'static;

/// Execute a presigned [`ForwardRequest`] against the backend and return
/// the response with a streaming body.
fn forward<Body: MaybeSend + 'static>(
fn forward(
&self,
request: ForwardRequest,
body: Body,
body: Self::Body,
) -> impl Future<Output = Result<ForwardResponse<Self::ResponseBody>, ProxyError>> + MaybeSend;

/// Create a [`PaginatedListStore`] for the given bucket configuration.
Expand Down
12 changes: 6 additions & 6 deletions crates/core/src/proxy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,15 +223,14 @@ where
/// GatewayResponse::Forward(resp) => stream_response(resp),
/// }
/// ```
pub async fn handle_request<Body, CF, Fut, E>(
pub async fn handle_request<CF, Fut, E>(
&self,
req: &RequestInfo<'_>,
body: Body,
body: B::Body,
collect_body: CF,
) -> GatewayResponse<B::ResponseBody>
where
Body: MaybeSend + 'static,
CF: FnOnce(Body) -> Fut,
CF: FnOnce(B::Body) -> Fut,
Fut: std::future::Future<Output = Result<Bytes, E>>,
E: std::fmt::Display,
{
Expand Down Expand Up @@ -969,11 +968,12 @@ mod tests {

impl ProxyBackend for MockBackend {
type ResponseBody = ();
type Body = ();

async fn forward<Body: MaybeSend + 'static>(
async fn forward(
&self,
_request: ForwardRequest,
_body: Body,
_body: (),
) -> Result<ForwardResponse<()>, ProxyError> {
unimplemented!("not needed for resolve_request tests")
}
Expand Down
12 changes: 4 additions & 8 deletions examples/lambda/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,12 @@ async fn body_to_bytes(body: Body) -> Result<Bytes, Box<dyn std::error::Error>>

impl ProxyBackend for LambdaBackend {
type ResponseBody = Body;
type Body = Body;

async fn forward<B: Send + 'static>(
async fn forward(
&self,
request: ForwardRequest,
body: B,
body: Body,
) -> Result<ForwardResponse<Self::ResponseBody>, ProxyError> {
let mut req_builder = self
.client
Expand All @@ -64,12 +65,7 @@ impl ProxyBackend for LambdaBackend {

// Attach body for PUT requests
if request.method == http::Method::PUT {
// Downcast to the concrete lambda_http::Body type used by the Lambda runtime.
let any_body: Box<dyn std::any::Any> = Box::new(body);
let lambda_body = any_body
.downcast::<Body>()
.map_err(|_| ProxyError::Internal("unexpected body type".into()))?;
let bytes = body_to_bytes(*lambda_body)
let bytes = body_to_bytes(body)
.await
.map_err(|e| ProxyError::Internal(format!("failed to read PUT body: {e}")))?;
req_builder = req_builder.body(bytes);
Expand Down
12 changes: 4 additions & 8 deletions examples/server/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,12 @@ impl Default for ServerBackend {

impl ProxyBackend for ServerBackend {
type ResponseBody = reqwest::Response;
type Body = axum::body::Body;

async fn forward<Body: Send + 'static>(
async fn forward(
&self,
request: ForwardRequest,
body: Body,
body: axum::body::Body,
) -> Result<ForwardResponse<Self::ResponseBody>, ProxyError> {
let mut req_builder = self
.client
Expand All @@ -63,12 +64,7 @@ impl ProxyBackend for ServerBackend {

// Attach streaming body for PUT
if request.method == http::Method::PUT {
// Downcast to the concrete axum::body::Body type used by the server runtime.
let any_body: Box<dyn std::any::Any> = Box::new(body);
let axum_body = any_body
.downcast::<axum::body::Body>()
.map_err(|_| ProxyError::Internal("unexpected body type".into()))?;
let body_stream = BodyStream::new(*axum_body)
let body_stream = BodyStream::new(body)
.try_filter_map(|frame| async move { Ok(frame.into_data().ok()) });
req_builder = req_builder.body(reqwest::Body::wrap_stream(body_stream));
}
Expand Down
Loading