We don't need WasiView, only its table

Signed-off-by: itowlson <[email protected]>

Author: itowlson

crates/factor-blobstore/src/host.rs

@@ -7,7 +7,6 @@ use std::{collections::HashSet, sync::Arc};
 use tokio::io::{ReadHalf, SimplexStream, WriteHalf};
 use tokio::sync::mpsc;
 use tokio::sync::RwLock;
-use wasmtime_wasi::WasiView;
 
 pub use bs::types::Error;
 
@@ -127,33 +126,18 @@ pub trait Finishable: Send + Sync {
 pub struct BlobStoreDispatch<'a> {
     allowed_containers: HashSet<String>,
     manager: Arc<dyn ContainerManager>,
-    wasi: wasmtime_wasi::WasiImpl<WasiImplInner<'a>>,
+    wasi_resources: &'a mut ResourceTable,
     containers: Arc<RwLock<Table<Arc<dyn Container>>>>,
     incoming_values: Arc<RwLock<Table<Box<dyn IncomingData>>>>,
     outgoing_values: Arc<RwLock<Table<OutgoingValue>>>,
     object_names: Arc<RwLock<Table<Box<dyn ObjectNames>>>>,
 }
 
-pub struct WasiImplInner<'a> {
-    pub ctx: &'a mut wasmtime_wasi::WasiCtx,
-    pub table: &'a mut ResourceTable,
-}
-
-impl wasmtime_wasi::WasiView for WasiImplInner<'_> {
-    fn ctx(&mut self) -> &mut wasmtime_wasi::WasiCtx {
-        self.ctx
-    }
-
-    fn table(&mut self) -> &mut ResourceTable {
-        self.table
-    }
-}
-
 impl<'a> BlobStoreDispatch<'a> {
     pub(crate) fn new(
         allowed_containers: HashSet<String>,
         manager: Arc<dyn ContainerManager>,
-        wasi: wasmtime_wasi::WasiImpl<WasiImplInner<'a>>,
+        wasi_resources: &'a mut ResourceTable,
         containers: Arc<RwLock<Table<Arc<dyn Container>>>>,
         incoming_values: Arc<RwLock<Table<Box<dyn IncomingData>>>>,
         outgoing_values: Arc<RwLock<Table<OutgoingValue>>>,
@@ -162,7 +146,7 @@ impl<'a> BlobStoreDispatch<'a> {
         Self {
             allowed_containers,
             manager,
-            wasi,
+            wasi_resources,
             containers,
             incoming_values,
             outgoing_values,
@@ -275,7 +259,7 @@ impl bs::types::HostIncomingValue for BlobStoreDispatch<'_> {
         let mut incoming = self.take_incoming_value(self_).await?;
         let async_body = incoming.as_mut().consume_async();
         let host_stm: Box<dyn wasmtime_wasi::HostInputStream> = Box::new(async_body);
-        let resource = self.wasi.table().push(host_stm).unwrap();
+        let resource = self.wasi_resources.push(host_stm).unwrap();
         Ok(resource)
     }
 
@@ -316,7 +300,7 @@ impl bs::types::HostOutgoingValue for BlobStoreDispatch<'_> {
         let stm = outgoing.write_stream()?;
 
         let host_stm: Box<dyn wasmtime_wasi::HostOutputStream> = Box::new(stm);
-        let resource = self.wasi.table().push(host_stm).unwrap();
+        let resource = self.wasi_resources.push(host_stm).unwrap();
 
         Ok(Ok(resource))
     }

crates/factor-blobstore/src/lib.rs

@@ -55,14 +55,10 @@ impl Factor for BlobStoreFactor {
         let get_data_with_table = ctx.get_data_with_table_fn();
         let closure = type_annotate(move |data| {
             let (state, table) = get_data_with_table(data);
-            let wasi = wasmtime_wasi::WasiImpl(host::WasiImplInner {
-                ctx: &mut state.ctx,
-                table,
-            });
             BlobStoreDispatch::new(
                 state.allowed_containers.clone(),
                 state.store_manager.clone(),
-                wasi,
+                table,
                 state.containers.clone(),
                 state.incoming_values.clone(),
                 state.outgoing_values.clone(),
@@ -116,8 +112,6 @@ impl Factor for BlobStoreFactor {
         &self,
         ctx: PrepareContext<T, Self>,
     ) -> anyhow::Result<InstanceBuilder> {
-        let mut wasi_ctx = wasmtime_wasi::WasiCtxBuilder::new();
-
         let app_state = ctx.app_state();
         let allowed_containers = app_state
             .component_allowed_containers
@@ -128,7 +122,6 @@ impl Factor for BlobStoreFactor {
         Ok(InstanceBuilder {
             store_manager: app_state.container_manager.clone(),
             allowed_containers,
-            ctx: wasi_ctx.build(),
             containers: Arc::new(RwLock::new(Table::new(capacity))),
             incoming_values: Arc::new(RwLock::new(Table::new(capacity))),
             object_names: Arc::new(RwLock::new(Table::new(capacity))),
@@ -175,7 +168,6 @@ pub struct InstanceBuilder {
     store_manager: Arc<DelegatingContainerManager>,
     /// The allowed stores for this component instance.
     allowed_containers: HashSet<String>,
-    ctx: wasmtime_wasi::WasiCtx,
     containers: Arc<RwLock<Table<Arc<dyn Container>>>>,
     incoming_values: Arc<RwLock<Table<Box<dyn IncomingData>>>>,
     outgoing_values: Arc<RwLock<Table<host::OutgoingValue>>>,