uniform view trait

Author: Pat Hickey

host/src/main.rs

@@ -101,10 +101,16 @@ async fn main() -> Result<()> {
             .inherit_network(cap_std::ambient_authority())
             .build();
         impl WasiSocketsView for CommandCtx {
-            fn table(&mut self) -> &mut Table {
+            fn table(&self) -> &Table {
+                &self.table
+            }
+            fn table_mut(&mut self) -> &mut Table {
                 &mut self.table
             }
-            fn ctx(&mut self) -> &mut WasiSocketsCtx {
+            fn ctx(&self) -> &WasiSocketsCtx {
+                &self.sockets
+            }
+            fn ctx_mut(&mut self) -> &mut WasiSocketsCtx {
                 &mut self.sockets
             }
         }

wasi-sockets/src/lib.rs

@@ -79,8 +79,10 @@ impl WasiSocketsCtx {
 }
 
 pub trait WasiSocketsView: Send {
-    fn ctx(&mut self) -> &mut WasiSocketsCtx;
-    fn table(&mut self) -> &mut Table;
+    fn table(&self) -> &Table;
+    fn table_mut(&mut self) -> &mut Table;
+    fn ctx(&self) -> &WasiSocketsCtx;
+    fn ctx_mut(&mut self) -> &mut WasiSocketsCtx;
 }
 
 pub fn add_to_linker<T: WasiSocketsView>(

wasi-sockets/src/network_impl.rs

@@ -12,7 +12,7 @@ pub(crate) fn convert(_error: wasi_common::Error) -> anyhow::Error {
 #[async_trait::async_trait]
 impl<T: WasiSocketsView> network::Host for T {
     async fn drop_network(&mut self, this: Network) -> anyhow::Result<()> {
-        let table = self.table();
+        let table = self.table_mut();
         if !table.delete::<Box<dyn WasiNetwork>>(this).is_ok() {
             anyhow::bail!("{this} is not a network");
         }
@@ -25,7 +25,7 @@ impl<T: WasiSocketsView> instance_network::Host for T {
     async fn instance_network(&mut self) -> anyhow::Result<Network> {
         let ctx = self.ctx();
         let network = (ctx.network_creator)(ctx.pool.clone())?;
-        let table = self.table();
+        let table = self.table_mut();
         let network = table.push(Box::new(network)).map_err(convert)?;
         Ok(network)
     }

wasi-sockets/src/tcp.rs

@@ -39,7 +39,7 @@ impl<T: WasiSocketsView> tcp::Host for T {
         &mut self,
         socket: TcpSocket,
     ) -> anyhow::Result<Result<(TcpSocket, InputStream, OutputStream), Error>> {
-        let table = self.table();
+        let table = self.table_mut();
         let socket = table.get_tcp_socket(socket)?;
 
         let (connection, input_stream, output_stream, _addr) = socket.accept(false).await?;
@@ -57,7 +57,7 @@ impl<T: WasiSocketsView> tcp::Host for T {
         network: Network,
         remote_address: IpSocketAddress,
     ) -> anyhow::Result<Result<(InputStream, OutputStream), Error>> {
-        let table = self.table();
+        let table = self.table_mut();
         let socket = table.get_tcp_socket(socket)?;
         let network = table.get_network(network)?;
 
@@ -260,7 +260,7 @@ impl<T: WasiSocketsView> tcp::Host for T {
     }
 
     async fn drop_tcp_socket(&mut self, this: TcpSocket) -> anyhow::Result<()> {
-        let table = self.table();
+        let table = self.table_mut();
         if !table.delete::<Box<dyn WasiTcpSocket>>(this).is_ok() {
             anyhow::bail!("{this} is not a socket");
         }
@@ -276,7 +276,7 @@ impl<T: WasiSocketsView> tcp_create_socket::Host for T {
     ) -> anyhow::Result<Result<TcpSocket, Error>> {
         let ctx = self.ctx();
         let socket = (ctx.tcp_socket_creator)(address_family.into())?;
-        let table = self.table();
+        let table = self.table_mut();
         let socket = table.push(Box::new(socket)).map_err(convert)?;
         Ok(Ok(socket))
     }

wasi-sockets/src/udp.rs

@@ -122,7 +122,8 @@ impl<T: WasiSocketsView> udp::Host for T {
         this: UdpSocket,
         value: bool,
     ) -> anyhow::Result<Result<(), Error>> {
-        let this = self.table().get_udp_socket_mut(this)?;
+        let table = self.table_mut();
+        let this = table.get_udp_socket_mut(this)?;
         this.set_nonblocking(value)?;
         Ok(Ok(()))
     }