Expose engine and component from executor app

Signed-off-by: Ryan Levick <[email protected]>

Author: rylev

Cargo.lock

@@ -211,6 +211,16 @@ impl<'a, T: RuntimeFactors, U> FactorsInstanceBuilder<'a, T, U> {
     pub fn factor_builder<F: Factor>(&mut self) -> Option<&mut F::InstanceBuilder> {
         self.factor_builders().for_factor::<F>()
     }
+
+    /// Returns the underlying wasmtime engine for the instance.
+    pub fn engine(&self) -> &spin_core::wasmtime::Engine {
+        self.instance_pre.engine()
+    }
+
+    /// Returns the compiled component for the instance.
+    pub fn component(&self) -> &Component {
+        self.instance_pre.component()
+    }
 }
 
 impl<'a, T: RuntimeFactors, U: Send> FactorsInstanceBuilder<'a, T, U> {

crates/factors-executor/src/lib.rs

@@ -9,7 +9,7 @@ anyhow = { workspace = true }
 http = { workspace = true }
 http-body-util = { workspace = true }
 hyper = { workspace = true }
-indexmap = "1"
+indexmap = "2"
 percent-encoding = "2"
 routefinder = "0.5.4"
 serde = { workspace = true }

crates/http/Cargo.toml

@@ -31,11 +31,13 @@ pub const WASI_HTTP_EXPORT_2023_11_10: &str = "wasi:http/[email protected]
 pub const WASI_HTTP_EXPORT_0_2_0: &str = "wasi:http/[email protected]";
 /// The `incoming-handler` export for `wasi:http` version 0.2.1
 pub const WASI_HTTP_EXPORT_0_2_1: &str = "wasi:http/[email protected]";
+/// The `inbound-http` export for `fermyon:spin`
+pub const SPIN_HTTP_EXPORT: &str = "fermyon:spin/inbound-http";
 
 impl HandlerType {
-    /// Determine the handler type from the exports of a component
+    /// Determine the handler type from the exports of a component.
     pub fn from_component(
-        engine: impl AsRef<wasmtime::Engine>,
+        engine: &wasmtime::Engine,
         component: &Component,
     ) -> anyhow::Result<HandlerType> {
         let mut handler_ty = None;
@@ -52,12 +54,12 @@ impl HandlerType {
             }
         };
         let ty = component.component_type();
-        for (name, _) in ty.exports(engine.as_ref()) {
+        for (name, _) in ty.exports(engine) {
             match name {
                 WASI_HTTP_EXPORT_2023_10_18 => set(HandlerType::Wasi2023_10_18)?,
                 WASI_HTTP_EXPORT_2023_11_10 => set(HandlerType::Wasi2023_11_10)?,
                 WASI_HTTP_EXPORT_0_2_0 | WASI_HTTP_EXPORT_0_2_1 => set(HandlerType::Wasi0_2)?,
-                "fermyon:spin/inbound-http" => set(HandlerType::Spin)?,
+                SPIN_HTTP_EXPORT => set(HandlerType::Spin)?,
                 _ => {}
             }
         }
@@ -69,7 +71,7 @@ impl HandlerType {
                 `{WASI_HTTP_EXPORT_2023_11_10}`, \
                 `{WASI_HTTP_EXPORT_0_2_0}`, \
                 `{WASI_HTTP_EXPORT_0_2_1}`, \
-                 or `fermyon:spin/inbound-http` but it exported none of those"
+                 or `{SPIN_HTTP_EXPORT}` but it exported none of those"
             )
         })
     }

crates/http/src/trigger.rs

@@ -104,7 +104,7 @@ impl<F: RuntimeFactors> HttpServer<F> {
                 let handler_type = match &trigger_config.executor {
                     None | Some(HttpExecutorType::Http) => {
                         let component = trigger_app.get_component(component_id)?;
-                        HandlerType::from_component(trigger_app.engine(), component)?
+                        HandlerType::from_component(trigger_app.engine().as_ref(), component)?
                     }
                     Some(HttpExecutorType::Wagi(wagi_config)) => {
                         anyhow::ensure!(