Migrate spin-http to new core

Signed-off-by: Lann Martin <lann.martin@fermyon.com>

Author: lann

Cargo.lock

@@ -40,6 +40,7 @@ spin-publish = { path = "crates/publish" }
 spin-redis-engine = { path = "crates/redis" }
 spin-templates = { path = "crates/templates" }
 spin-trigger = { path = "crates/trigger" }
+spin-trigger-new = { path = "crates/trigger-new" }
 tempfile = "3.3.0"
 tokio = { version = "1.11", features = [ "full" ] }
 toml = "0.5"

Cargo.toml

@@ -110,16 +110,17 @@ impl<'a> App<'a> {
         &self.uri
     }
 
-    pub fn get_metadata<'this, T: Deserialize<'this>>(&'this self, key: &str) -> Option<Result<T>> {
+    pub fn get_metadata<'this, T: Deserialize<'this>>(&'this self, key: &str) -> Result<Option<T>> {
         self.locked
             .metadata
             .get(key)
             .map(|value| Ok(T::deserialize(value)?))
+            .transpose()
     }
 
     pub fn require_metadata<'this, T: Deserialize<'this>>(&'this self, key: &str) -> Result<T> {
-        self.get_metadata(key)
-            .ok_or_else(|| Error::ManifestError(format!("missing required {key:?}")))?
+        self.get_metadata(key)?
+            .ok_or_else(|| Error::ManifestError(format!("missing required {key:?}")))
     }
 
     pub fn variables(&self) -> impl Iterator<Item = (&String, &Variable)> {
@@ -169,11 +170,18 @@ impl<'a> AppComponent<'a> {
         self.locked.files.iter()
     }
 
-    pub fn get_metadata<T: Deserialize<'a>>(&self, key: &str) -> Option<Result<T>> {
+    pub fn get_metadata<T: Deserialize<'a>>(&self, key: &str) -> Result<Option<T>> {
         self.locked
             .metadata
             .get(key)
-            .map(|value| Ok(T::deserialize(value)?))
+            .map(|value| {
+                T::deserialize(value).map_err(|err| {
+                    Error::ManifestError(format!(
+                        "failed to deserialize {key:?} = {value:?}: {err:?}"
+                    ))
+                })
+            })
+            .transpose()
     }
 
     pub fn config(&self) -> impl Iterator<Item = (&String, &String)> {

crates/app/src/lib.rs

@@ -9,7 +9,7 @@ use anyhow::Result;
 use tracing::instrument;
 use wasmtime_wasi::WasiCtx;
 
-pub use wasmtime::{self, Instance, Module};
+pub use wasmtime::{self, Instance, Module, Trap};
 
 use self::host_component::{HostComponents, HostComponentsBuilder};
 

crates/core/src/lib.rs

@@ -17,20 +17,19 @@ http = "0.2"
 hyper = { version = "0.14", features = ["full"] }
 indexmap = "1"
 percent-encoding = "2"
-spin-manifest = { path = "../manifest" }
-spin-engine = { path = "../engine" }
-spin-trigger = { path = "../trigger" }
+rustls-pemfile = "0.3.0"
+serde = { version = "1.0", features = ["derive"] }
+spin-app = { path = "../app" }
+spin-core = { path = "../core" }
+spin-trigger-new = { path = "../trigger-new" }
 tls-listener = { version = "0.4.0", features = [
     "rustls",
     "hyper-h1",
     "hyper-h2",
 ] }
 tokio = { version = "1.10", features = ["full"] }
 tokio-rustls = { version = "0.23.2" }
-rustls-pemfile = "0.3.0"
 tracing = { version = "0.1", features = ["log"] }
-wasi-common = "0.39.1"
-wasmtime = { version = "0.39.1", features = ["async"] }
 
 [dependencies.wit-bindgen-wasmtime]
 git = "https://github.com/bytecodealliance/wit-bindgen"
@@ -39,8 +38,8 @@ features = ["async"]
 
 [dev-dependencies]
 criterion = { version = "0.3.5", features = ["async_tokio"] }
-miniserde = "0.1"
 num_cpus = "1"
+serde_json = "1"
 spin-testing = { path = "../testing" }
 
 [[bench]]

crates/http/Cargo.toml

@@ -7,7 +7,6 @@ use futures::future::join_all;
 use http::uri::Scheme;
 use http::Request;
 use spin_http::HttpTrigger;
-use spin_manifest::{HttpConfig, HttpExecutor};
 use spin_testing::{assert_http_response_success, TestConfig};
 use tokio::runtime::Runtime;
 use tokio::task;
@@ -29,7 +28,7 @@ fn bench_startup(c: &mut Criterion) {
         b.to_async(&async_runtime).iter(|| async {
             let trigger = TestConfig::default()
                 .test_program("spin-http-benchmark.wasm")
-                .http_trigger(Default::default())
+                .http_spin_trigger("/")
                 .build_http_trigger()
                 .await;
             run_concurrent_requests(Arc::new(trigger), 0, 1).await;
@@ -39,10 +38,7 @@ fn bench_startup(c: &mut Criterion) {
         b.to_async(&async_runtime).iter(|| async {
             let trigger = TestConfig::default()
                 .test_program("wagi-benchmark.wasm")
-                .http_trigger(HttpConfig {
-                    executor: Some(HttpExecutor::Wagi(Default::default())),
-                    ..Default::default()
-                })
+                .http_wagi_trigger("/", Default::default())
                 .build_http_trigger()
                 .await;
             run_concurrent_requests(Arc::new(trigger), 0, 1).await;
@@ -58,7 +54,7 @@ fn bench_spin_concurrency_minimal(c: &mut Criterion) {
         async_runtime.block_on(
             TestConfig::default()
                 .test_program("spin-http-benchmark.wasm")
-                .http_trigger(Default::default())
+                .http_spin_trigger("/")
                 .build_http_trigger(),
         ),
     );
@@ -94,10 +90,7 @@ fn bench_wagi_concurrency_minimal(c: &mut Criterion) {
         async_runtime.block_on(
             TestConfig::default()
                 .test_program("wagi-benchmark.wasm")
-                .http_trigger(HttpConfig {
-                    executor: Some(HttpExecutor::Wagi(Default::default())),
-                    ..Default::default()
-                })
+                .http_wagi_trigger("/", Default::default())
                 .build_http_trigger(),
         ),
     );