Review comments & fixing CI

Author: alexcrichton

crates/wasi/src/p2/bindings.rs

@@ -172,6 +172,7 @@ pub mod sync {
                 "wasi:sockets/udp.incoming-datagram-stream": super::super::sockets::udp::IncomingDatagramStream,
                 "wasi:sockets/udp.outgoing-datagram-stream": super::super::sockets::udp::OutgoingDatagramStream,
                 "wasi:sockets/udp.udp-socket": crate::p2::UdpSocket,
+                "wasi:sockets/ip-name-lookup.resolve-address-stream": crate::p2::ip_name_lookup::ResolveAddressStream,
 
                 // Error host trait from wasmtime-wasi-io is synchronous, so we can alias it
                 "wasi:io/error": wasmtime_wasi_io::bindings::wasi::io::error,

crates/wasi/src/p2/host/udp.rs

@@ -221,12 +221,8 @@ impl udp::HostIncomingDatagramStream for WasiSocketsCtxView<'_> {
         &mut self,
         this: Resource<udp::IncomingDatagramStream>,
     ) -> Result<(), wasmtime::Error> {
-        // As in the filesystem implementation, we assume closing a socket
-        // doesn't block.
         let dropped = self.table.delete(this)?;
-
         dropped.finish().await;
-
         Ok(())
     }
 }

crates/wasi/src/p2/ip_name_lookup.rs

@@ -74,3 +74,47 @@ impl Pollable for ResolveAddressStream {
         std::future::poll_fn(|cx| self.0.poll_ready(cx).map(|_| ())).await
     }
 }
+
+mod sync {
+    use super::ResolveAddressStream;
+    use crate::p2::SocketError;
+    use crate::p2::bindings::sockets::network::{IpAddress, Network};
+    use crate::p2::bindings::sync::sockets::ip_name_lookup::{Host, HostResolveAddressStream};
+    use crate::runtime::in_tokio;
+    use crate::sockets::WasiSocketsCtxView;
+    use wasmtime::Result;
+    use wasmtime::component::Resource;
+    use wasmtime_wasi_io::poll::DynPollable;
+
+    impl Host for WasiSocketsCtxView<'_> {
+        fn resolve_addresses(
+            &mut self,
+            network: Resource<Network>,
+            name: String,
+        ) -> Result<Resource<ResolveAddressStream>, SocketError> {
+            <Self as super::Host>::resolve_addresses(self, network, name)
+        }
+    }
+
+    impl HostResolveAddressStream for WasiSocketsCtxView<'_> {
+        fn resolve_next_address(
+            &mut self,
+            resource: Resource<ResolveAddressStream>,
+        ) -> Result<Option<IpAddress>, SocketError> {
+            <Self as super::HostResolveAddressStream>::resolve_next_address(self, resource)
+        }
+
+        fn subscribe(
+            &mut self,
+            resource: Resource<ResolveAddressStream>,
+        ) -> Result<Resource<DynPollable>> {
+            <Self as super::HostResolveAddressStream>::subscribe(self, resource)
+        }
+
+        fn drop(&mut self, resource: Resource<ResolveAddressStream>) -> Result<()> {
+            in_tokio(<Self as super::HostResolveAddressStream>::drop(
+                self, resource,
+            ))
+        }
+    }
+}

crates/wasi/src/p2/mod.rs

@@ -329,6 +329,7 @@ pub fn add_to_linker_with_options_async<T: WasiView>(
     bindings::sockets::tcp::add_to_linker::<T, WasiSockets>(l, T::sockets)?;
     bindings::sockets::udp::add_to_linker::<T, WasiSockets>(l, T::sockets)?;
     bindings::sockets::udp_create_socket::add_to_linker::<T, WasiSockets>(l, T::sockets)?;
+    bindings::sockets::ip_name_lookup::add_to_linker::<T, WasiSockets>(l, T::sockets)?;
     Ok(())
 }
 
@@ -362,7 +363,6 @@ where
     sockets::tcp_create_socket::add_to_linker::<T, WasiSockets>(l, T::sockets)?;
     sockets::instance_network::add_to_linker::<T, WasiSockets>(l, T::sockets)?;
     sockets::network::add_to_linker::<T, WasiSockets>(l, &options.into(), T::sockets)?;
-    sockets::ip_name_lookup::add_to_linker::<T, WasiSockets>(l, T::sockets)?;
     Ok(())
 }
 
@@ -469,6 +469,7 @@ pub fn add_to_linker_with_options_sync<T: WasiView>(
     bindings::sync::sockets::tcp::add_to_linker::<T, WasiSockets>(l, T::sockets)?;
     bindings::sync::sockets::udp::add_to_linker::<T, WasiSockets>(l, T::sockets)?;
     bindings::sync::sockets::udp_create_socket::add_to_linker::<T, WasiSockets>(l, T::sockets)?;
+    bindings::sync::sockets::ip_name_lookup::add_to_linker::<T, WasiSockets>(l, T::sockets)?;
     Ok(())
 }