adapt p3 backend to modular facades

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: yoshuawuyts

src/runtime.rs

@@ -9,7 +9,12 @@
 
 pub use ::async_task::Task;
 
-pub use crate::sys::runtime::{AsyncPollable, Reactor, WaitFor, block_on};
+#[cfg(wstd_p3)]
+#[doc(hidden)]
+pub use crate::sys::runtime::{__MainReturn, __finish_main};
+#[cfg(wstd_p2)]
+pub use crate::sys::runtime::{AsyncPollable, WaitFor};
+pub use crate::sys::runtime::{Reactor, block_on};
 
 /// Spawn a `Future` as a `Task` on the current `Reactor`.
 ///

src/sys/p3/io.rs

@@ -3,6 +3,10 @@ use std::pin::Pin;
 use std::task::{Context, Poll};
 use wasip3::wit_bindgen::rt::async_support::{StreamReader, StreamResult, StreamWriter};
 
+mod stdio;
+
+pub use stdio::*;
+
 /// A wrapper for a p3 `StreamReader<u8>` that provides `AsyncRead`.
 pub struct AsyncInputStream {
     reader: StreamReader<u8>,

src/sys/p3/stdio.rs src/sys/p3/io/stdio.rssrc/sys/p3/stdio.rs renamed to src/sys/p3/io/stdio.rs

@@ -1,7 +1,6 @@
 pub mod http;
 pub mod io;
 pub mod net;
-pub mod random;
+pub mod rand;
 pub mod runtime;
-pub mod stdio;
 pub mod time;

src/sys/p3/mod.rs

@@ -93,11 +93,12 @@ impl TcpStream {
     }
 
     /// Returns the socket address of the remote peer of this TCP connection.
-    pub fn peer_addr(&self) -> io::Result<SocketAddr> {
+    pub fn peer_addr(&self) -> io::Result<String> {
         self.socket
             .get_remote_address()
             .map_err(to_io_err)
             .map(sockaddr_from_wasi)
+            .map(|addr| addr.to_string())
     }
 
     pub fn split(&self) -> (ReadHalf<'_>, WriteHalf<'_>) {

src/sys/p3/net/tcp_stream.rs

@@ -0,0 +1,13 @@
+//! Random number generation.
+
+use wasip3::random;
+
+/// Return `len` cryptographically secure random bytes.
+pub fn random_bytes(len: u64) -> Vec<u8> {
+    random::random::get_random_bytes(len)
+}
+
+/// Return `len` insecure, non-cryptographic random bytes.
+pub fn insecure_random_bytes(len: u64) -> Vec<u8> {
+    random::insecure::get_insecure_random_bytes(len)
+}

src/sys/p3/rand.rs

@@ -1,5 +1,3 @@
-pub use ::async_task::Task;
-
 use async_task::{Runnable, Task as AsyncTask};
 use core::future::Future;
 use std::cell::RefCell;
@@ -72,17 +70,6 @@ impl<E: core::fmt::Debug> __MainReturn for Result<(), E> {
     }
 }
 
-/// Spawn a `Future` as a `Task` on the current `Reactor`.
-///
-/// Panics if called from outside `block_on`.
-pub fn spawn<F, T>(fut: F) -> Task<T>
-where
-    F: std::future::Future<Output = T> + 'static,
-    T: 'static,
-{
-    Reactor::current().spawn(fut)
-}
-
 /// Manage async task scheduling for WASI 0.3
 #[derive(Debug, Clone)]
 pub struct Reactor {