Merge pull request #13 from yoshuawuyts/pch/enable_ci_and_write_tests

Enable CI and write some tests that execute with wasmtime

Author: pchickey

.github/workflows/ci.yaml

@@ -11,6 +11,36 @@ env:
   RUSTFLAGS: -Dwarnings
 
 jobs:
+  build_and_test:
+    name: Build and test
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macOS-latest]
+        rust: [stable]
+
+    steps:
+    - uses: actions/checkout@master
+
+    - name: Install ${{ matrix.rust }}
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: ${{ matrix.rust }}
+        target: wasm32-wasip2
+        override: true
+
+    - name: check
+      uses: actions-rs/cargo@v1
+      with:
+        command: check
+        args: --all --bins --examples
+
+    - name: tests
+      uses: actions-rs/cargo@v1
+      with:
+        command: test
+        args: --all
+
   check_fmt_and_docs:
     name: Checking fmt and docs
     runs-on: ubuntu-latest

Cargo.toml

@@ -1,13 +1,12 @@
 [package]
 name = "wstd"
-version = "0.4.0"
-license = "MIT OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception"
+version.workspace = true
+license.workspace = true
 repository = "https://github.com/yoshuawuyts/wstd"
 documentation = "https://docs.rs/wstd"
 description = "An async standard library for Wasm Components and WASI 0.2"
 readme = "README.md"
-edition = "2021"
-resolver = "2"
+edition.workspace = true
 keywords = ["WebAssembly", "async", "stdlib", "Components"]
 categories = []
 authors = [
@@ -17,8 +16,46 @@ authors = [
 [features]
 
 [dependencies]
+slab.workspace = true
+url.workspace = true
+wasi.workspace = true
+wstd-macro.workspace = true
+
+[dev-dependencies]
+anyhow.workspace = true
+serde_json.workspace = true
+test-programs-artifacts.workspace = true
+wasmtime.workspace = true
+wasmtime-wasi.workspace = true
+wasmtime-wasi-http.workspace = true
+
+[workspace]
+members = [
+    "macro",
+    "test-programs",
+    "test-programs/artifacts",
+]
+resolver = "2"
+
+[workspace.package]
+version = "0.4.0"
+edition = "2021"
+license = "MIT OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception"
+
+[workspace.dependencies]
+anyhow = "1"
+cargo_metadata = "0.18.1"
+heck = "0.5"
+quote = "1.0"
+serde_json = "1"
 slab = "0.4.9"
+syn = "2.0"
+test-programs = { path = "test-programs" }
+test-programs-artifacts = { path = "test-programs/artifacts" }
 url = "2.5.0"
 wasi = "0.13.1"
-
-[dev-dependencies]
+wasmtime = "26"
+wasmtime-wasi = "26"
+wasmtime-wasi-http = "26"
+wstd = { path = "." }
+wstd-macro = { path = "macro" }

examples/http_get.rs

@@ -0,0 +1,34 @@
+use std::error::Error;
+use wstd::http::{Client, Method, Request, Url};
+use wstd::io::AsyncRead;
+
+#[wstd::main]
+async fn main() -> Result<(), Box<dyn Error>> {
+    let request = Request::new(Method::Get, Url::parse("https://postman-echo.com/get")?);
+    let mut response = Client::new().send(request).await?;
+
+    let content_type = response
+        .headers()
+        .get(&"content-type".into())
+        .ok_or_else(|| "response expected to have content-type header")?;
+    assert_eq!(content_type.len(), 1, "one header value for content-type");
+    assert_eq!(content_type[0], b"application/json; charset=utf-8");
+
+    // Would much prefer read_to_end here:
+    let mut body_buf = vec![0; 4096];
+    let body_len = response.body().read(&mut body_buf).await?;
+    body_buf.truncate(body_len);
+
+    let val: serde_json::Value = serde_json::from_slice(&body_buf)?;
+    let body_url = val
+        .get("url")
+        .ok_or_else(|| "body json has url")?
+        .as_str()
+        .ok_or_else(|| "body json url is str")?;
+    assert!(
+        body_url.contains("postman-echo.com/get"),
+        "expected body url to contain the authority and path, got: {body_url}"
+    );
+
+    Ok(())
+}

examples/tcp_echo_server.rs

@@ -0,0 +1,18 @@
+use wstd::io;
+use wstd::iter::AsyncIterator;
+use wstd::net::TcpListener;
+
+#[wstd::main]
+async fn main() -> io::Result<()> {
+    let listener = TcpListener::bind("127.0.0.1:8080").await?;
+    println!("Listening on {}", listener.local_addr()?);
+    println!("type `nc localhost 8080` to create a TCP client");
+
+    let mut incoming = listener.incoming();
+    while let Some(stream) = incoming.next().await {
+        let stream = stream?;
+        println!("Accepted from: {}", stream.peer_addr()?);
+        io::copy(&stream, &stream).await?;
+    }
+    Ok(())
+}

macro/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "wstd-macro"
+version.workspace = true
+edition.workspace = true
+license.workspace = true
+
+[lib]
+proc-macro = true
+
+[dependencies]
+syn = { workspace = true, features = ["full"] }
+quote.workspace = true

macro/src/lib.rs

@@ -0,0 +1,46 @@
+use proc_macro::TokenStream;
+use quote::{quote, quote_spanned};
+use syn::{parse_macro_input, spanned::Spanned, ItemFn};
+
+#[proc_macro_attribute]
+pub fn attr_macro_main(_attr: TokenStream, item: TokenStream) -> TokenStream {
+    let input = parse_macro_input!(item as ItemFn);
+
+    if input.sig.asyncness.is_none() {
+        return quote_spanned! { input.sig.fn_token.span()=>
+            compile_error!("fn must be `async fn`");
+        }
+        .into();
+    }
+
+    if input.sig.ident != "main" {
+        return quote_spanned! { input.sig.ident.span()=>
+            compile_error!("only `async fn main` can be used for #[wstd::main]");
+        }
+        .into();
+    }
+
+    if !input.sig.inputs.is_empty() {
+        return quote_spanned! { input.sig.inputs.span()=>
+            compile_error!("arguments to main are not supported");
+        }
+        .into();
+    }
+    let attrs = input.attrs;
+    let output = input.sig.output;
+    let block = input.block;
+    quote! {
+        pub fn main() #output {
+
+            #(#attrs)*
+            async fn __run() #output {
+                #block
+            }
+
+            ::wstd::runtime::block_on(async {
+                __run().await
+            })
+        }
+    }
+    .into()
+}

rust-toolchain.toml

@@ -0,0 +1,3 @@
+[toolchain]
+channel = "1.82.0"
+targets = ["wasm32-wasip2"]

src/lib.rs

@@ -12,27 +12,14 @@
 //!
 //! **TCP echo server**
 //!
-//! ```rust
-//! use wstd::io;
-//! use wstd::iter::AsyncIterator;
-//! use wstd::net::TcpListener;
-//! use wstd::runtime::block_on;
+//! ```rust,no_run
+#![doc = include_str!("../examples/tcp_echo_server.rs")]
+//! ```
 //!
-//! fn main() -> io::Result<()> {
-//!     block_on(async move {
-//!         let listener = TcpListener::bind("127.0.0.1:8080").await?;
-//!         println!("Listening on {}", listener.local_addr()?);
-//!         println!("type `nc localhost 8080` to create a TCP client");
+//! **HTTP Client**
 //!
-//!         let mut incoming = listener.incoming();
-//!         while let Some(stream) = incoming.next().await {
-//!             let stream = stream?;
-//!             println!("Accepted from: {}", stream.peer_addr()?);
-//!             io::copy(&stream, &stream).await?;
-//!         }
-//!         Ok(())
-//!     })
-//! }
+//! ```rust,no_run
+#![doc = include_str!("../examples/http_get.rs")]
 //! ```
 //!
 //! # Design Decisions
@@ -64,3 +51,5 @@ pub mod net;
 pub mod rand;
 pub mod runtime;
 pub mod time;
+
+pub use wstd_macro::attr_macro_main as main;

test-programs/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "test-programs"
+version = "0.1.0"
+edition = "2021"
+publish = false
+
+[dependencies]
+serde_json.workspace = true
+wstd.workspace = true

test-programs/artifacts/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "test-programs-artifacts"
+version = "0.1.0"
+edition.workspace = true
+license.workspace = true
+publish = false
+
+[dependencies]
+
+[build-dependencies]
+cargo_metadata.workspace = true
+heck.workspace = true