-
Notifications
You must be signed in to change notification settings - Fork 257
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Lift http handler type discovery up a layer
This commit lifts the discovery of what type of handler a component is, for example spin-vs-wasi-vs-wasi-snapshot, up one layer from where it currently resides. Previously this determination was made on each request and now it's made when a component first loaded and pre-instantiated instead. This would shift possible errors earlier in the system, for example. This removes a bit of per-request work and makes the creation of the handler in `execute_wasi` a bit more straightforward with less guessing of exports for something that was already probed. Signed-off-by: Alex Crichton <[email protected]>
- Loading branch information
1 parent
5d09e10
commit b2dfbf0
Showing
3 changed files
with
91 additions
and
59 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,6 @@ | ||
| use std::{net::SocketAddr, str, str::FromStr}; | ||
|
|
||
| use crate::{Body, ChainedRequestHandler, HttpExecutor, HttpInstance, HttpTrigger, Store}; | ||
| use anyhow::bail; | ||
| use anyhow::{anyhow, Context, Result}; | ||
| use futures::TryFutureExt; | ||
| use http::{HeaderName, HeaderValue}; | ||
|
|
@@ -11,7 +10,7 @@ use outbound_http::OutboundHttpComponent; | |
| use spin_core::async_trait; | ||
| use spin_core::wasi_2023_10_18::exports::wasi::http::incoming_handler::Guest as IncomingHandler2023_10_18; | ||
| use spin_core::wasi_2023_11_10::exports::wasi::http::incoming_handler::Guest as IncomingHandler2023_11_10; | ||
| use spin_core::Instance; | ||
| use spin_core::{ComponentType, Instance}; | ||
| use spin_http::body; | ||
| use spin_http::routes::RouteMatch; | ||
| use spin_trigger::TriggerAppEngine; | ||
|
|
@@ -43,26 +42,21 @@ impl HttpExecutor for HttpHandlerExecutor { | |
| ); | ||
|
|
||
| let (instance, mut store) = engine.prepare_instance(component_id).await?; | ||
| let HttpInstance::Component(instance) = instance else { | ||
| let HttpInstance::Component(instance, ty) = instance else { | ||
| unreachable!() | ||
| }; | ||
|
|
||
| set_http_origin_from_request(&mut store, engine.clone(), self, &req); | ||
|
|
||
| let resp = match HandlerType::from_exports(instance.exports(&mut store)) { | ||
| Some(HandlerType::Wasi) => { | ||
| Self::execute_wasi(store, instance, base, route_match, req, client_addr).await? | ||
| } | ||
| Some(HandlerType::Spin) => { | ||
| let resp = match ty { | ||
| HandlerType::Spin => { | ||
| Self::execute_spin(store, instance, base, route_match, req, client_addr) | ||
| .await | ||
| .map_err(contextualise_err)? | ||
| } | ||
| None => bail!( | ||
| "Expected component to either export `{WASI_HTTP_EXPORT_2023_10_18}`, \ | ||
| `{WASI_HTTP_EXPORT_2023_11_10}`, `{WASI_HTTP_EXPORT_0_2_0}`, \ | ||
| or `fermyon:spin/inbound-http` but it exported none of those" | ||
| ), | ||
| _ => { | ||
| Self::execute_wasi(store, instance, ty, base, route_match, req, client_addr).await? | ||
| } | ||
| }; | ||
|
|
||
| tracing::info!( | ||
|
|
@@ -157,6 +151,7 @@ impl HttpHandlerExecutor { | |
| async fn execute_wasi( | ||
| mut store: Store, | ||
| instance: Instance, | ||
| ty: HandlerType, | ||
| base: &str, | ||
| route_match: &RouteMatch, | ||
| mut req: Request<Body>, | ||
|
|
@@ -188,31 +183,33 @@ impl HttpHandlerExecutor { | |
| Handler2023_10_18(IncomingHandler2023_10_18), | ||
| } | ||
|
|
||
| let handler = match instance | ||
| .exports(&mut store) | ||
| .instance("wasi:http/[email protected]") | ||
| { | ||
| Some(mut instance) => Some(Handler::Handler2023_10_18(IncomingHandler2023_10_18::new( | ||
| &mut instance, | ||
| )?)), | ||
| None => None, | ||
| }; | ||
| let handler = match handler { | ||
| Some(handler) => Some(handler), | ||
| None => match instance | ||
| .exports(&mut store) | ||
| .instance("wasi:http/[email protected]") | ||
| let handler = | ||
| { | ||
| Some(mut instance) => Some(Handler::Handler2023_11_10( | ||
| IncomingHandler2023_11_10::new(&mut instance)?, | ||
| )), | ||
| None => None, | ||
| }, | ||
| }; | ||
| let handler = match handler { | ||
| Some(handler) => handler, | ||
| None => Handler::Latest(Proxy::new(&mut store, &instance)?), | ||
| }; | ||
| let mut exports = instance.exports(&mut store); | ||
| match ty { | ||
| HandlerType::Wasi2023_10_18 => { | ||
| let mut instance = exports | ||
| .instance(WASI_HTTP_EXPORT_2023_10_18) | ||
| .ok_or_else(|| { | ||
| anyhow!("export of `{WASI_HTTP_EXPORT_2023_10_18}` not an instance") | ||
| })?; | ||
| Handler::Handler2023_10_18(IncomingHandler2023_10_18::new(&mut instance)?) | ||
| } | ||
| HandlerType::Wasi2023_11_10 => { | ||
| let mut instance = exports | ||
| .instance(WASI_HTTP_EXPORT_2023_11_10) | ||
| .ok_or_else(|| { | ||
| anyhow!("export of `{WASI_HTTP_EXPORT_2023_11_10}` not an instance") | ||
| })?; | ||
| Handler::Handler2023_11_10(IncomingHandler2023_11_10::new(&mut instance)?) | ||
| } | ||
| HandlerType::Wasi0_2 => { | ||
| drop(exports); | ||
| Handler::Latest(Proxy::new(&mut store, &instance)?) | ||
| } | ||
| HandlerType::Spin => unreachable!(), | ||
| } | ||
| }; | ||
|
|
||
| let span = tracing::debug_span!("execute_wasi"); | ||
| let handle = task::spawn( | ||
|
|
@@ -336,28 +333,51 @@ impl HttpHandlerExecutor { | |
| } | ||
|
|
||
| /// Whether this handler uses the custom Spin http handler interface for wasi-http | ||
| enum HandlerType { | ||
| #[derive(Copy, Clone)] | ||
| pub enum HandlerType { | ||
| Spin, | ||
| Wasi, | ||
| Wasi0_2, | ||
| Wasi2023_11_10, | ||
| Wasi2023_10_18, | ||
| } | ||
|
|
||
| const WASI_HTTP_EXPORT_2023_10_18: &str = "wasi:http/[email protected]"; | ||
| const WASI_HTTP_EXPORT_2023_11_10: &str = "wasi:http/[email protected]"; | ||
| const WASI_HTTP_EXPORT_0_2_0: &str = "wasi:http/[email protected]"; | ||
|
|
||
| impl HandlerType { | ||
| /// Determine the handler type from the exports | ||
| fn from_exports(mut exports: wasmtime::component::Exports<'_>) -> Option<HandlerType> { | ||
| if exports.instance(WASI_HTTP_EXPORT_2023_10_18).is_some() | ||
| || exports.instance(WASI_HTTP_EXPORT_2023_11_10).is_some() | ||
| || exports.instance(WASI_HTTP_EXPORT_0_2_0).is_some() | ||
| { | ||
| return Some(HandlerType::Wasi); | ||
| } | ||
| if exports.instance("fermyon:spin/inbound-http").is_some() { | ||
| return Some(HandlerType::Spin); | ||
| /// Determine the handler type from the exports of a component | ||
| pub fn from_component(ty: &ComponentType) -> Result<HandlerType> { | ||
| let mut handler_ty = None; | ||
|
|
||
| let mut set = |ty: HandlerType| { | ||
| if handler_ty.is_none() { | ||
| handler_ty = Some(ty); | ||
| Ok(()) | ||
| } else { | ||
| Err(anyhow!( | ||
| "component exports multiple different handlers but \ | ||
| it's expected to export only one" | ||
| )) | ||
| } | ||
| }; | ||
| for (name, _) in ty.exports() { | ||
| 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 => set(HandlerType::Wasi0_2)?, | ||
| "fermyon:spin/inbound-http" => set(HandlerType::Spin)?, | ||
| _ => {} | ||
| } | ||
| } | ||
| None | ||
|
|
||
| handler_ty.ok_or_else(|| { | ||
| anyhow!( | ||
| "Expected component to either export `{WASI_HTTP_EXPORT_2023_10_18}`, \ | ||
| `{WASI_HTTP_EXPORT_2023_11_10}`, `{WASI_HTTP_EXPORT_0_2_0}`, \ | ||
| or `fermyon:spin/inbound-http` but it exported none of those" | ||
| ) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters