feat(wasi): add support for wasi:[email protected]

Signed-off-by: Roman Volosatovs <[email protected]>

ci/vendor-wit.sh

@@ -45,6 +45,10 @@ make_vendor "wasi/src/p2" "
   [email protected]
 "
 
+make_vendor "wasi/src/p3" "
+  random@[email protected]
+"
+
 make_vendor "wasi-http/src/p2" "
   [email protected]
   [email protected]

crates/test-programs/artifacts/build.rs

@@ -71,6 +71,7 @@ fn build_and_generate_tests() {
             s if s.starts_with("http_") => "http",
             s if s.starts_with("preview1_") => "preview1",
             s if s.starts_with("preview2_") => "preview2",
+            s if s.starts_with("preview3_") => "preview3",
             s if s.starts_with("cli_") => "cli",
             s if s.starts_with("api_") => "api",
             s if s.starts_with("nn_") => "nn",

crates/test-programs/src/bin/preview2_random.rs

@@ -1,4 +1,4 @@
-use test_programs::wasi::random;
+use test_programs::wasi::random0_2_3 as random;
 
 fn main() {
     let mut bytes = [0_u8; 256];

crates/test-programs/src/bin/preview3_random.rs

@@ -0,0 +1,40 @@
+use test_programs::wasi::random0_3_0 as random;
+
+fn main() {
+    let mut bytes = [0_u8; 256];
+    getrandom::getrandom(&mut bytes).unwrap();
+
+    assert!(bytes.iter().any(|x| *x != 0));
+
+    // Acquired random bytes should be of the expected length.
+    let array = random::random::get_random_bytes(100);
+    assert_eq!(array.len(), 100);
+
+    // It shouldn't take 100+ tries to get a nonzero random integer.
+    for i in 0.. {
+        if random::random::get_random_u64() == 0 {
+            continue;
+        }
+        assert!(i < 100);
+        break;
+    }
+
+    // The `insecure_seed` API should return the same result each time.
+    let (a1, b1) = random::insecure_seed::insecure_seed();
+    let (a2, b2) = random::insecure_seed::insecure_seed();
+    assert_eq!(a1, a2);
+    assert_eq!(b1, b2);
+
+    // Acquired random bytes should be of the expected length.
+    let array = random::insecure::get_insecure_random_bytes(100);
+    assert_eq!(array.len(), 100);
+
+    // It shouldn't take 100+ tries to get a nonzero random integer.
+    for i in 0.. {
+        if random::insecure::get_insecure_random_u64() == 0 {
+            continue;
+        }
+        assert!(i < 100);
+        break;
+    }
+}

crates/test-programs/src/lib.rs

@@ -12,9 +12,12 @@ wit_bindgen::generate!({
             include wasi:http/[email protected];
             include wasi:config/[email protected];
             include wasi:keyvalue/[email protected];
+
+            include wasi:random/[email protected];
         }
     ",
     path: [
+        "../wasi/src/p3/wit",
         "../wasi-http/src/p2/wit",
         "../wasi-config/src/p2/wit",
         "../wasi-keyvalue/src/p2/wit",
@@ -33,7 +36,7 @@ pub mod proxy {
         with: {
             "wasi:http/[email protected]": crate::wasi::http::types,
             "wasi:http/[email protected]": crate::wasi::http::outgoing_handler,
-            "wasi:random/[email protected]": crate::wasi::random::random,
+            "wasi:random/[email protected]": crate::wasi::random0_2_3::random,
             "wasi:io/[email protected]": crate::wasi::io::error,
             "wasi:io/[email protected]": crate::wasi::io::poll,
             "wasi:io/[email protected]": crate::wasi::io::streams,

crates/test-programs/src/sockets.rs

@@ -1,7 +1,7 @@
 use crate::wasi::clocks::monotonic_clock;
 use crate::wasi::io::poll::{self, Pollable};
 use crate::wasi::io::streams::{InputStream, OutputStream, StreamError};
-use crate::wasi::random;
+use crate::wasi::random0_2_3 as random;
 use crate::wasi::sockets::instance_network;
 use crate::wasi::sockets::ip_name_lookup;
 use crate::wasi::sockets::network::{

crates/wasi/Cargo.toml

@@ -57,6 +57,7 @@ default = [ "preview1"]
 preview1 = [
     "dep:wiggle",
 ]
+p3 = []
 
 [[test]]
 name = "process_stdin"

crates/wasi/src/lib.rs

@@ -190,6 +190,8 @@ mod filesystem;
 mod ip_name_lookup;
 mod network;
 pub mod p2;
+#[cfg(feature = "p3")]
+pub mod p3;
 pub mod pipe;
 mod poll;
 #[cfg(feature = "preview1")]