refactor: introduce p2 module

ci/vendor-wit.sh

@@ -36,7 +36,7 @@ make_vendor() {
 
 cache_dir=$(mktemp -d)
 
-make_vendor "wasi" "
+make_vendor "wasi/src/p2" "
   [email protected]
   [email protected]
   [email protected]
@@ -45,7 +45,7 @@ make_vendor "wasi" "
   [email protected]
 "
 
-make_vendor "wasi-http" "
+make_vendor "wasi-http/src/p2" "
   [email protected]
   [email protected]
   [email protected]
@@ -55,9 +55,9 @@ make_vendor "wasi-http" "
   [email protected]
 "
 
-make_vendor "wasi-config" "config@f4d699b"
+make_vendor "wasi-config/src/p2" "config@f4d699b"
 
-make_vendor "wasi-keyvalue" "keyvalue@219ea36"
+make_vendor "wasi-keyvalue/src/p2" "keyvalue@219ea36"
 
 rm -rf $cache_dir
 

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

@@ -2,7 +2,7 @@ use std::sync::{Mutex, MutexGuard};
 
 wit_bindgen::generate!({
     world: "test-reactor",
-    path: "../wasi/wit",
+    path: "../wasi/src/p2/wit",
     generate_all,
 });
 

crates/test-programs/src/lib.rs

@@ -15,9 +15,9 @@ wit_bindgen::generate!({
         }
     ",
     path: [
-        "../wasi-http/wit",
-        "../wasi-config/wit",
-        "../wasi-keyvalue/wit",
+        "../wasi-http/src/p2/wit",
+        "../wasi-config/src/p2/wit",
+        "../wasi-keyvalue/src/p2/wit",
     ],
     world: "wasmtime:test/test",
     features: ["cli-exit-with-code"],
@@ -26,7 +26,7 @@ wit_bindgen::generate!({
 
 pub mod proxy {
     wit_bindgen::generate!({
-        path: "../wasi-http/wit",
+        path: "../wasi-http/src/p2/wit",
         world: "wasi:http/proxy",
         default_bindings_module: "test_programs::proxy",
         pub_export_macro: true,

crates/wasi-config/src/lib.rs

@@ -67,17 +67,11 @@
 
 #![deny(missing_docs)]
 
-use anyhow::Result;
 use std::collections::HashMap;
 
-mod gen_ {
-    wasmtime::component::bindgen!({
-        path: "wit",
-        world: "wasi:config/imports",
-        trappable_imports: true,
-    });
-}
-use self::gen_::wasi::config::store as generated;
+pub mod p2;
+#[doc(inline)]
+pub use p2::*;
 
 /// Capture the state necessary for use in the `wasi-config` API implementation.
 #[derive(Default)]
@@ -123,27 +117,3 @@ impl<'a> WasiConfig<'a> {
         Self { vars }
     }
 }
-
-impl generated::Host for WasiConfig<'_> {
-    fn get(&mut self, key: String) -> Result<Result<Option<String>, generated::Error>> {
-        Ok(Ok(self.vars.0.get(&key).map(|s| s.to_owned())))
-    }
-
-    fn get_all(&mut self) -> Result<Result<Vec<(String, String)>, generated::Error>> {
-        Ok(Ok(self
-            .vars
-            .0
-            .iter()
-            .map(|(k, v)| (k.to_string(), v.to_string()))
-            .collect()))
-    }
-}
-
-/// Add all the `wasi-config` world's interfaces to a [`wasmtime::component::Linker`].
-pub fn add_to_linker<T>(
-    l: &mut wasmtime::component::Linker<T>,
-    f: impl Fn(&mut T) -> WasiConfig<'_> + Send + Sync + Copy + 'static,
-) -> Result<()> {
-    generated::add_to_linker_get_host(l, f)?;
-    Ok(())
-}

crates/wasi-config/src/p2/mod.rs

@@ -0,0 +1,36 @@
+//! Implementation of wasip2 version of `wasi:config` package
+
+mod gen_ {
+    wasmtime::component::bindgen!({
+        path: "src/p2/wit",
+        world: "wasi:config/imports",
+        trappable_imports: true,
+    });
+}
+use self::gen_::wasi::config::store as generated;
+
+use crate::WasiConfig;
+
+impl generated::Host for WasiConfig<'_> {
+    fn get(&mut self, key: String) -> anyhow::Result<Result<Option<String>, generated::Error>> {
+        Ok(Ok(self.vars.0.get(&key).map(|s| s.to_owned())))
+    }
+
+    fn get_all(&mut self) -> anyhow::Result<Result<Vec<(String, String)>, generated::Error>> {
+        Ok(Ok(self
+            .vars
+            .0
+            .iter()
+            .map(|(k, v)| (k.to_string(), v.to_string()))
+            .collect()))
+    }
+}
+
+/// Add all the `wasi-config` world's interfaces to a [`wasmtime::component::Linker`].
+pub fn add_to_linker<T>(
+    l: &mut wasmtime::component::Linker<T>,
+    f: impl Fn(&mut T) -> WasiConfig<'_> + Send + Sync + Copy + 'static,
+) -> anyhow::Result<()> {
+    generated::add_to_linker_get_host(l, f)?;
+    Ok(())
+}

crates/wasi-http/src/body.rs

@@ -1,6 +1,6 @@
 //! Implementation of the `wasi:http/types` interface's various body types.
 
-use crate::{bindings::http::types, types::FieldMap};
+use crate::{p2::bindings::http::types, types::FieldMap};
 use anyhow::anyhow;
 use bytes::Bytes;
 use http_body::{Body, Frame};

crates/wasi-http/src/error.rs

@@ -1,4 +1,4 @@
-use crate::bindings::http::types::ErrorCode;
+use crate::p2::bindings::http::types::ErrorCode;
 use std::error::Error;
 use std::fmt;
 use wasmtime_wasi::ResourceTableError;
@@ -59,7 +59,7 @@ impl fmt::Display for HttpError {
 impl Error for HttpError {}
 
 pub(crate) fn dns_error(rcode: String, info_code: u16) -> ErrorCode {
-    ErrorCode::DnsError(crate::bindings::http::types::DnsErrorPayload {
+    ErrorCode::DnsError(crate::p2::bindings::http::types::DnsErrorPayload {
         rcode: Some(rcode),
         info_code: Some(info_code),
     })