Merge pull request #1 from erikziyunchi/jmwample/re-org

Reorganize

.github/workflows/rust.yml

@@ -10,15 +10,42 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
+  format:
+    name: Verify code Fromatting
+    runs-on: "ubuntu-latest"
+    steps:
+    - uses: actions/checkout@v3
+    - name: Format
+      run: cargo fmt --all -- --check
+
+  lint:
+    name: Lint with clippy
+    needs: format
+    strategy:
+      fail-fast: true
+    runs-on: "ubuntu-latest"
+    env:
+      RUSTFLAGS: -Dwarnings
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Lint
+      run: cargo clippy --workspace --all-targets --verbose --all-features
+
   build:
+    name: Test and Build
+    needs: format
+    # needs: [format, lint]
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
         os: [ "ubuntu-latest", "macos-latest" ]
+
     runs-on: ${{ matrix.os }}
+
     steps:
     - uses: actions/checkout@v3
+    - name: Test
+      run: cargo test --verbose --workspace --all-features
     - name: Build
       run: cargo build --verbose
-    - name: Test
-      run: cargo test --verbose

.gitignore

@@ -1,4 +1,5 @@
 */target
-/target
+target
 .DS_Store
-.vscode
+.vscode
+Cargo.lock

Cargo.toml

@@ -1,44 +1,13 @@
-[package]
-name = "W-A-T-E-R"
-version = "0.1.0"
-author = "cerikccc@gmail.com"
-edition = "2021"
-
-[lib]
-# crate-type = ["cdylib"]
-name = "water"
-path = "src/lib.rs"
-
-[[bin]]
-name = "water_cli"
-path = "src/main.rs"
 
-[dependencies]
-anyhow = "1.0.7"
-tracing = "0.1"
-tracing-subscriber = "0.3.17"
-clap = { version="4.2.1", features = ["derive"] }
-wasmtime = "12.0.1"
-wasmtime-wasi = "12.0.1"
-wasi-common = "12.0.1"
-wasmtime-wasi-threads = "12.0.1"
-futures = "0.3"
-cap-std = "2.0.0"
-libc = "0.2.147"
-serde = { version = "1.0", features = ["derive"] }
-url = { version = "2.2.2", features = ["serde"] }
-toml = "0.7.6"
-once_cell = "1.13.0"
+[workspace]
+members = ["crates/*", "examples/water_bins/*", "examples/clients/*"]
+# exclude = ["crates/foo", "path/to/other"]
+default-members = ["crates/*"]
+resolver="2"
 
-bitflags = "2.4.0"
 
-bincode = "1.3"
-
-rustls = "0.20.6"
-rustls-pemfile = "1.0.0"
-zeroize = { version = "1.5.4", features = ["alloc"] }
-
-# test & benchmark dependency
-[dev-dependencies]
-rand = "0.8"
-pprof = { version = "0.11.1", features = ["flamegraph", "protobuf-codec", "prost-codec"] }
+[workspace.package]
+authors = ["cerikccc@gmail.com", "gaukas", "jmwample", "ewust"]
+description = "Water WebAssembly Transport Executor for rust"
+edition = "2021"
+# documentation = "https://example.com/bar"

crates/water/Cargo.toml

@@ -0,0 +1,32 @@
+[package]
+name = "water"
+version = "0.1.0"
+authors.workspace = true
+description.workspace = true
+edition.workspace = true
+
+[lib]
+# crate-type = ["cdylib"]
+name = "water"
+path = "src/lib.rs"
+
+[dependencies]
+anyhow = "1.0.7"
+tracing = "0.1"
+tracing-subscriber = "0.3.17"
+wasmtime = "12.0.1"
+wasmtime-wasi = "12.0.1"
+wasi-common = "12.0.1"
+wasmtime-wasi-threads = "12.0.1"
+futures = "0.3"
+cap-std = "2.0.0"
+libc = "0.2.147"
+serde = { version = "1.0", features = ["derive"] }
+url = { version = "2.2.2", features = ["serde"] }
+toml = "0.7.6"
+once_cell = "1.13.0"
+bitflags = "2.4.0"
+bincode = "1.3"
+rustls = "0.20.6"
+rustls-pemfile = "1.0.0"
+zeroize = { version = "1.5.4", features = ["alloc"] }

crates/water/src/config/mod.rs

@@ -0,0 +1,27 @@
+pub mod wasm_shared_config;
+
+pub struct WATERConfig {
+    pub filepath: String,
+    pub entry_fn: String,
+    pub config_wasm: String,
+    pub client_type: u32,
+    pub debug: bool,
+}
+
+impl WATERConfig {
+    pub fn init(
+        filepath: String,
+        entry_fn: String,
+        config_wasm: String,
+        client_type: u32,
+        debug: bool,
+    ) -> Result<Self, anyhow::Error> {
+        Ok(WATERConfig {
+            filepath,
+            entry_fn,
+            config_wasm,
+            client_type,
+            debug,
+        })
+    }
+}

src/config/wasm_shared_config.rs → crates/water/src/config/wasm_shared_config.rs

@@ -1,21 +1,19 @@
+use serde::{Deserialize, Serialize};
 use std::mem;
-use serde::{Serialize, Deserialize};
 
 #[repr(C)]
 pub struct WASMSharedConfig {
-
-//     pub key: u64, // a pointer to a key string's byte-view
-//     pub size: u64, // size for the key
+    //     pub key: u64, // a pointer to a key string's byte-view
+    //     pub size: u64, // size for the key
 }
 
 impl WASMSharedConfig {
     pub fn to_bytes(&self) -> Vec<u8> {
         let size = mem::size_of::<WASMSharedConfig>();
         let ptr = self as *const Self;
-        
+
         let bytes_slice = unsafe { std::slice::from_raw_parts(ptr as *const u8, size) };
-        let bytes = bytes_slice.to_vec();
-        bytes
+        bytes_slice.to_vec()
     }
 
     // pub fn from_bytes(bytes: Vec<u8>) -> Option<Self> {
@@ -42,9 +40,8 @@ impl StreamConfig {
     pub fn to_bytes(&self) -> Vec<u8> {
         let size = mem::size_of::<StreamConfig>();
         let ptr = self as *const Self;
-        
+
         let bytes_slice = unsafe { std::slice::from_raw_parts(ptr as *const u8, size) };
-        let bytes = bytes_slice.to_vec();
-        bytes
+        bytes_slice.to_vec()
     }
 }

crates/water/src/errors/mod.rs

@@ -0,0 +1 @@
+

src/globals.rs → crates/water/src/globals.rs

@@ -1,5 +1,7 @@
+#![allow(dead_code)]
+
 pub const WASM_PATH: &str = "./proxy.wasm";
-pub const CONFIF_WASM_PATH: &str = "./conf.json";
+pub const CONFIG_WASM_PATH: &str = "./conf.json";
 
 const ALLOC_FN: &str = "alloc";
 const MEMORY: &str = "memory";

crates/water/src/lib.rs

@@ -0,0 +1,14 @@
+extern crate anyhow;
+extern crate cap_std;
+extern crate serde;
+extern crate tracing;
+extern crate wasi_common;
+extern crate wasmtime;
+extern crate wasmtime_wasi;
+extern crate wasmtime_wasi_threads;
+
+pub mod config;
+pub mod errors;
+pub mod globals;
+pub mod runtime;
+pub mod utils;