Move the rest of the components over to use the helper

Signed-off-by: Ryan Levick <ryan.levick@fermyon.com>

Author: rylev

Cargo.lock

@@ -17,4 +17,5 @@ resolver = "2"
 
 [workspace.dependencies]
 anyhow = "1.0"
+helper = { path = "crates/helper" }
 wit-bindgen = "0.26"

Cargo.toml

@@ -8,5 +8,5 @@ crate-type = ["cdylib"]
 
 [dependencies]
 anyhow = { workspace = true }
-helper = { path = "../../crates/helper" }
+helper = { workspace = true }
 wit-bindgen = { workspace = true }

components/key-value/Cargo.toml

@@ -4,15 +4,12 @@ struct Component;
 
 helper::gen_http_trigger_bindings!(Component);
 
-use bindings::{
-    exports::wasi::http0_2_0::incoming_handler::Guest,
+use helper::bindings::{
     fermyon::spin2_0_0::key_value::{Error, Store},
-};
-use helper::bindings::wasi::http0_2_0::types::{
-    IncomingRequest, OutgoingResponse, ResponseOutparam,
+    wasi::http0_2_0::types::{IncomingRequest, OutgoingResponse, ResponseOutparam},
 };
 
-impl Guest for Component {
+impl bindings::Guest for Component {
     fn handle(request: IncomingRequest, response_out: ResponseOutparam) {
         helper::handle_result(handle(request), response_out);
     }

components/key-value/src/lib.rs

@@ -8,5 +8,5 @@ crate-type = ["cdylib"]
 
 [dependencies]
 anyhow = { workspace = true }
-helper = { path = "../../crates/helper" }
+helper = { workspace = true }
 wit-bindgen = { workspace = true }

components/outbound-redis/Cargo.toml

@@ -3,12 +3,13 @@ use anyhow::Context as _;
 struct Component;
 
 helper::gen_http_trigger_bindings!(Component);
-use bindings::{exports::wasi::http0_2_0::incoming_handler::Guest, fermyon::spin2_0_0::redis};
-use helper::bindings::wasi::http0_2_0::types::{
-    IncomingRequest, OutgoingResponse, ResponseOutparam,
+
+use helper::bindings::{
+    fermyon::spin2_0_0::redis,
+    wasi::http0_2_0::types::{IncomingRequest, OutgoingResponse, ResponseOutparam},
 };
 
-impl Guest for Component {
+impl bindings::Guest for Component {
     fn handle(request: IncomingRequest, response_out: ResponseOutparam) {
         helper::handle_result(handle(request), response_out);
     }

components/outbound-redis/src/lib.rs

@@ -7,5 +7,7 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
+anyhow = { workspace = true }
+helper = { workspace = true }
 url = "2.4.0"
 wit-bindgen = { workspace = true }

components/outbound-wasi-http-v0.2.0/Cargo.toml

@@ -1,26 +1,16 @@
-wit_bindgen::generate!({
-    path: "../../wit",
-    world: "wasi:http/proxy@0.2.0",
-});
-
-use exports::wasi::http0_2_0::incoming_handler;
-use url::Url;
-use wasi::{
-    http0_2_0::{
-        outgoing_handler,
-        types::{
-            Headers, IncomingRequest, Method, OutgoingBody, OutgoingRequest, OutgoingResponse,
-            ResponseOutparam, Scheme,
-        },
-    },
-    io0_2_0::streams::StreamError,
+use helper::bindings::wasi::http0_2_0::outgoing_handler;
+use helper::bindings::wasi::http0_2_0::types::{
+    Headers, IncomingRequest, Method, OutgoingBody, OutgoingRequest, OutgoingResponse,
+    ResponseOutparam, Scheme,
 };
+use helper::bindings::wasi::io0_2_0::streams::StreamError;
+use url::Url;
 
 struct Component;
 
-export!(Component);
+helper::gen_http_trigger_bindings!(Component);
 
-impl incoming_handler::Guest for Component {
+impl bindings::Guest for Component {
     fn handle(request: IncomingRequest, outparam: ResponseOutparam) {
         // The request must have a "url" header.
         let Some(url) = request.headers().entries().iter().find_map(|(k, v)| {
@@ -30,7 +20,7 @@ impl incoming_handler::Guest for Component {
                 .and_then(|v| Url::parse(v).ok())
         }) else {
             // Otherwise, return a 400 Bad Request response.
-            return_response(outparam, 400, b"Bad Request");
+            return_response(outparam, 400, b"missing header: url");
             return;
         };
 
@@ -55,7 +45,7 @@ impl incoming_handler::Guest for Component {
             .unwrap();
 
         // Write the request body.
-        write_outgoing_body(outgoing_request.body().unwrap(), b"Hello, world!");
+        helper::write_outgoing_body(outgoing_request.body().unwrap(), b"Hello, world!");
 
         // Get the incoming response.
         let response = match outgoing_handler::handle(outgoing_request, None) {
@@ -103,20 +93,7 @@ impl incoming_handler::Guest for Component {
     }
 }
 
-fn write_outgoing_body(outgoing_body: OutgoingBody, message: &[u8]) {
-    assert!(message.len() <= 4096);
-    {
-        let outgoing_stream = outgoing_body.write().unwrap();
-        outgoing_stream.blocking_write_and_flush(message).unwrap();
-        // The outgoing stream must be dropped before the outgoing body is finished.
-    }
-    OutgoingBody::finish(outgoing_body, None).unwrap();
-}
-
 fn return_response(outparam: ResponseOutparam, status: u16, body: &[u8]) {
-    let response = OutgoingResponse::new(Headers::new());
-    response.set_status_code(status).unwrap();
-    write_outgoing_body(response.body().unwrap(), body);
-
+    let response = helper::response(status, body);
     ResponseOutparam::set(outparam, Ok(response));
 }

components/outbound-wasi-http-v0.2.0/src/lib.rs

@@ -9,5 +9,6 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-wit-bindgen = { workspace = true }
 anyhow = { workspace = true }
+helper = { workspace = true }
+wit-bindgen = { workspace = true }

components/request-shape/Cargo.toml

@@ -1,38 +1,24 @@
-use anyhow::Context;
+use anyhow::Context as _;
 use std::collections::HashMap;
 
-mod bindings {
-    wit_bindgen::generate!({
-            world: "http-trigger",
-            path:  "../../wit",
-    });
-    use super::Component;
-    export!(Component);
-}
-
-use bindings::{
-    exports::wasi::http0_2_0::incoming_handler::{Guest, IncomingRequest, ResponseOutparam},
-    wasi::http0_2_0::types::{ErrorCode, Headers, OutgoingResponse},
+use helper::bindings::wasi::http0_2_0::types::{
+    IncomingRequest, Method, OutgoingResponse, ResponseOutparam, Scheme,
 };
 
-use crate::bindings::wasi::http0_2_0::types::{Method, Scheme};
-
 pub struct Component;
+helper::gen_http_trigger_bindings!(Component);
 
-impl Guest for Component {
+impl bindings::Guest for Component {
     fn handle(request: IncomingRequest, response_out: ResponseOutparam) {
-        let result = handle(request)
-            .map(|_| OutgoingResponse::new(Headers::new()))
-            .map_err(|e| ErrorCode::InternalError(Some(e.to_string())));
-        ResponseOutparam::set(response_out, result)
+        helper::handle_result(handle(request), response_out);
     }
 }
 
-fn handle(req: IncomingRequest) -> anyhow::Result<()> {
+fn handle(req: IncomingRequest) -> anyhow::Result<OutgoingResponse> {
     check_method(&req)?;
     check_url(&req)?;
     check_headers(&req)?;
-    Ok(())
+    Ok(helper::ok_response())
 }
 
 fn check_method(req: &IncomingRequest) -> anyhow::Result<()> {

components/request-shape/src/lib.rs

@@ -4,8 +4,9 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-wit-bindgen = { workspace = true }
 anyhow = { workspace = true }
+helper = { workspace = true }
+wit-bindgen = { workspace = true }
 
 [lib]
 crate-type = ["cdylib"]

components/sqlite/Cargo.toml

@@ -1,33 +1,19 @@
-use bindings::{
-    exports::wasi::http0_2_0::incoming_handler::Guest,
+use helper::bindings::{
     fermyon::spin2_0_0::sqlite::{Connection, Error, Value},
-    wasi::http0_2_0::types::{
-        Headers, IncomingRequest, OutgoingBody, OutgoingResponse, ResponseOutparam,
-    },
+    wasi::http0_2_0::types::{IncomingRequest, OutgoingResponse, ResponseOutparam},
 };
 
-mod bindings {
-    wit_bindgen::generate!({
-            world: "http-trigger",
-            path:  "../../wit",
-    });
-    use super::Component;
-    export!(Component);
-}
-
 struct Component;
-impl Guest for Component {
-    fn handle(request: IncomingRequest, response_out: ResponseOutparam) {
-        let result = match handle(request) {
-            Ok(()) => response(200, b""),
-            Err(e) => response(500, format!("{e}").as_bytes()),
-        };
 
-        ResponseOutparam::set(response_out, Ok(result))
+helper::gen_http_trigger_bindings!(Component);
+
+impl bindings::Guest for Component {
+    fn handle(request: IncomingRequest, response_out: ResponseOutparam) {
+        helper::handle_result(handle(request), response_out)
     }
 }
 
-fn handle(_request: IncomingRequest) -> anyhow::Result<()> {
+fn handle(_request: IncomingRequest) -> anyhow::Result<OutgoingResponse> {
     anyhow::ensure!(matches!(
         Connection::open("forbidden"),
         Err(Error::AccessDenied)
@@ -61,21 +47,5 @@ fn handle(_request: IncomingRequest) -> anyhow::Result<()> {
     anyhow::ensure!(matches!(fetched_key, Value::Text(t) if t == "my_key"));
     anyhow::ensure!(matches!(fetched_value, Value::Text(t) if t == "my_value"));
 
-    Ok(())
-}
-
-fn response(status: u16, body: &[u8]) -> OutgoingResponse {
-    let response = OutgoingResponse::new(Headers::new());
-    response.set_status_code(status).unwrap();
-    if !body.is_empty() {
-        assert!(body.len() <= 4096);
-        let outgoing_body = response.body().unwrap();
-        {
-            let outgoing_stream = outgoing_body.write().unwrap();
-            outgoing_stream.blocking_write_and_flush(body).unwrap();
-            // The outgoing stream must be dropped before the outgoing body is finished.
-        }
-        OutgoingBody::finish(outgoing_body, None).unwrap();
-    }
-    response
+    Ok(helper::ok_response())
 }

components/sqlite/src/lib.rs

@@ -7,5 +7,6 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-wit-bindgen = { workspace = true }
 anyhow = { workspace = true }
+helper = { workspace = true }
+wit-bindgen = { workspace = true }