Use wasi-streams in the wasi-http implementation

crates/test-programs/tests/wasi-http-components-sync.rs

@@ -46,12 +46,13 @@ impl WasiView for Ctx {
 }
 
 impl WasiHttpView for Ctx {
-    fn http_ctx(&self) -> &WasiHttpCtx {
-        &self.http
-    }
-    fn http_ctx_mut(&mut self) -> &mut WasiHttpCtx {
+    fn ctx(&mut self) -> &mut WasiHttpCtx {
         &mut self.http
     }
+
+    fn table(&mut self) -> &mut Table {
+        &mut self.table
+    }
 }
 
 fn instantiate_component(
@@ -60,7 +61,7 @@ fn instantiate_component(
 ) -> Result<(Store<Ctx>, Command), anyhow::Error> {
     let mut linker = Linker::new(&ENGINE);
     add_to_linker(&mut linker)?;
-    wasmtime_wasi_http::proxy::sync::add_to_linker(&mut linker)?;
+    wasmtime_wasi_http::proxy::add_to_linker(&mut linker)?;
 
     let mut store = Store::new(&ENGINE, ctx);
 
@@ -84,7 +85,7 @@ fn run(name: &str) -> anyhow::Result<()> {
             builder.env(var, val);
         }
         let wasi = builder.build(&mut table)?;
-        let http = WasiHttpCtx::new();
+        let http = WasiHttpCtx {};
 
         let (mut store, command) = instantiate_component(component, Ctx { table, wasi, http })?;
         command

crates/test-programs/tests/wasi-http-components.rs

@@ -47,10 +47,10 @@ impl WasiView for Ctx {
 }
 
 impl WasiHttpView for Ctx {
-    fn http_ctx(&self) -> &WasiHttpCtx {
-        &self.http
+    fn table(&mut self) -> &mut Table {
+        &mut self.table
     }
-    fn http_ctx_mut(&mut self) -> &mut WasiHttpCtx {
+    fn ctx(&mut self) -> &mut WasiHttpCtx {
         &mut self.http
     }
 }
@@ -85,16 +85,11 @@ async fn run(name: &str) -> anyhow::Result<()> {
             builder.env(var, val);
         }
         let wasi = builder.build(&mut table)?;
-        let http = WasiHttpCtx::new();
+        let http = WasiHttpCtx;
 
         let (mut store, command) =
             instantiate_component(component, Ctx { table, wasi, http }).await?;
-        command
-            .wasi_cli_run()
-            .call_run(&mut store)
-            .await?
-            .map_err(|()| anyhow::anyhow!("run returned a failure"))?;
-        Ok(())
+        command.wasi_cli_run().call_run(&mut store).await
     };
     r.map_err(move |trap: anyhow::Error| {
         let stdout = stdout.try_into_inner().expect("single ref to stdout");
@@ -109,7 +104,8 @@ async fn run(name: &str) -> anyhow::Result<()> {
             "error while testing wasi-tests {} with http-components",
             name
         ))
-    })?;
+    })?
+    .map_err(|()| anyhow::anyhow!("run returned an error"))?;
     Ok(())
 }
 

crates/test-programs/wasi-http-tests/src/bin/outbound_request_invalid_dnsname.rs

@@ -15,6 +15,6 @@ async fn run() {
     )
     .await;
 
-    let error = res.unwrap_err();
-    assert_eq!(error.to_string(), "Error::InvalidUrl(\"invalid dnsname\")");
+    let error = res.unwrap_err().to_string();
+    assert!(error.starts_with("Error::InvalidUrl(\"failed to lookup address information:"));
 }

crates/test-programs/wasi-http-tests/src/bin/outbound_request_invalid_version.rs

@@ -17,7 +17,7 @@ async fn run() {
 
     let error = res.unwrap_err().to_string();
     if error.ne("Error::ProtocolError(\"invalid HTTP version parsed\")")
-        && error.ne("Error::ProtocolError(\"operation was canceled\")")
+        && !error.starts_with("Error::ProtocolError(\"operation was canceled")
     {
         panic!(
             r#"assertion failed: `(left == right)`

crates/test-programs/wasi-http-tests/src/bin/outbound_request_large_post.rs

@@ -23,7 +23,7 @@ async fn run() {
     .context("localhost:3000 /post large")
     .unwrap();
 
-    println!("localhost:3000 /post large: {res:?}");
+    println!("localhost:3000 /post large: {}", res.status);
     assert_eq!(res.status, 200);
     let method = res.header("x-wasmtime-test-method").unwrap();
     assert_eq!(std::str::from_utf8(method).unwrap(), "POST");

crates/test-programs/wasi-http-tests/src/bin/outbound_request_post.rs

@@ -22,5 +22,5 @@ async fn run() {
     assert_eq!(res.status, 200);
     let method = res.header("x-wasmtime-test-method").unwrap();
     assert_eq!(std::str::from_utf8(method).unwrap(), "POST");
-    assert_eq!(res.body, b"{\"foo\": \"bar\"}");
+    assert_eq!(res.body, b"{\"foo\": \"bar\"}", "invalid body returned");
 }

crates/test-programs/wasi-http-tests/src/bin/outbound_request_unknown_method.rs

@@ -18,6 +18,6 @@ async fn run() {
     let error = res.unwrap_err();
     assert_eq!(
         error.to_string(),
-        "Error::InvalidUrl(\"unknown method OTHER\")"
+        "Error::Invalid(\"unknown method OTHER\")"
     );
 }

crates/test-programs/wasi-http-tests/src/bin/outbound_request_unsupported_scheme.rs

@@ -18,6 +18,6 @@ async fn run() {
     let error = res.unwrap_err();
     assert_eq!(
         error.to_string(),
-        "Error::InvalidUrl(\"unsupported scheme WS\")"
+        "Error::Invalid(\"unsupported scheme WS\")"
     );
 }