Skip to content

wasmtime-wasi-http: Replace new_incoming_request's hyper::Error to Into<ErrorCode> #12227

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

Open
namse wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −3
Open

wasmtime-wasi-http: Replace new_incoming_request's hyper::Error to Into<ErrorCode> #12227

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
6 changes: 6 additions & 0 deletions crates/wasi-http/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,3 +112,9 @@ pub fn hyper_response_error(err: hyper::Error) -> ErrorCode {

ErrorCode::HttpProtocolError
}

impl From<hyper::Error> for ErrorCode {
fn from(err: hyper::Error) -> Self {
hyper_response_error(err)
}
}
7 changes: 4 additions & 3 deletions crates/wasi-http/src/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//! implementation of the wasi-http API.

use crate::{
bindings::http::types::{self, Method, Scheme},
bindings::http::types::{self, ErrorCode, Method, Scheme},
body::{HostIncomingBody, HyperIncomingBody, HyperOutgoingBody},
};
use anyhow::bail;
Expand Down Expand Up @@ -92,11 +92,12 @@ pub trait WasiHttpView {
req: hyper::Request<B>,
) -> wasmtime::Result<Resource<HostIncomingRequest>>
where
B: Body<Data = Bytes, Error = hyper::Error> + Send + 'static,
B: Body<Data = Bytes> + Send + 'static,
B::Error: Into<ErrorCode>,
Self: Sized,
{
let (parts, body) = req.into_parts();
let body = body.map_err(crate::hyper_response_error).boxed_unsync();
let body = body.map_err(Into::into).boxed_unsync();
let body = HostIncomingBody::new(
body,
// TODO: this needs to be plumbed through
Expand Down