Base support for WASI in wasmer-js

Cargo.toml

@@ -44,6 +44,7 @@ members = [
     "lib/engine-dylib",
     "lib/engine-staticlib",
     "lib/object",
+    "lib/vfs",
     "lib/vm",
     "lib/wasi",
     "lib/wasi-types",
@@ -54,6 +55,7 @@ members = [
     "tests/integration/cli",
     "fuzz",
 ]
+resolver = "2"
 
 [build-dependencies]
 test-generator = { path = "tests/lib/test-generator" }
@@ -72,6 +74,10 @@ wasmer-engine-dummy = { path = "tests/lib/engine-dummy" }
 compiler-test-derive = { path = "tests/lib/compiler-test-derive" }
 tempfile = "3.1"
 loupe = "0.1"
+# For logging tests using the `RUST_LOG=debug` when testing
+test-env-log = { version = "0.2", default-features = false, features = ["trace"] }
+tracing = { version = "0.1", default-features = false, features = ["log"] }
+tracing-subscriber = { version = "0.2", default-features = false, features = ["env-filter", "fmt"] }
 
 [features]
 # Don't add the compiler features in default, please add them on the Makefile
@@ -80,7 +86,6 @@ default = [
     "wat",
     "wast",
     "universal",
-    "dylib",
     "staticlib",
     "cache",
     "wasi",
@@ -280,4 +285,4 @@ required-features = ["cranelift"]
 [[example]]
 name = "features"
 path = "examples/features.rs"
-required-features = ["cranelift"]
+required-features = ["cranelift"]

Makefile

@@ -357,7 +357,7 @@ build-wasmer:
 	cargo build --release --manifest-path lib/cli/Cargo.toml $(compiler_features) --bin wasmer
 
 build-wasmer-debug:
-	cargo build --manifest-path lib/cli/Cargo.toml $(compiler_features) --bin wasmer
+	cargo build --manifest-path lib/cli/Cargo.toml $(compiler_features) --features "debug"  --bin wasmer
 
 bench:
 	cargo bench $(compiler_features)
@@ -500,9 +500,13 @@ test-packages:
 	cargo test --manifest-path lib/compiler-singlepass/Cargo.toml --release --no-default-features --features=std
 	cargo test --manifest-path lib/cli/Cargo.toml $(compiler_features) --release
 
-test-js:
+test-js: test-js-api test-js-wasi
+
+test-js-api:
 	cd lib/api && wasm-pack test --node -- --no-default-features --features js-default,wat
 
+test-js-wasi:
+	cd lib/wasi && wasm-pack test --node -- --no-default-features --features=test-js
 
 #####
 #

lib/api/src/js/import_object.rs

@@ -115,6 +115,23 @@ impl ImportObject {
     }
 }
 
+impl Into<js_sys::Object> for ImportObject {
+    fn into(self) -> js_sys::Object {
+        let guard = self.map.lock().unwrap();
+        let map = guard.borrow();
+
+        let imports = js_sys::Object::new();
+        for (module, ns) in map.iter() {
+            let import_namespace = js_sys::Object::new();
+            for (name, exp) in ns.get_namespace_exports() {
+                js_sys::Reflect::set(&import_namespace, &name.into(), exp.as_jsvalue()).unwrap();
+            }
+            js_sys::Reflect::set(&imports, &module.into(), &import_namespace.into()).unwrap();
+        }
+        imports
+    }
+}
+
 impl NamedResolver for ImportObject {
     fn resolve_by_name(&self, module: &str, name: &str) -> Option<Export> {
         self.get_export(module, name)

lib/api/src/sys/externals/memory.rs

@@ -226,6 +226,11 @@ impl Memory {
         unsafe { MemoryView::new(base as _, length as u32) }
     }
 
+    /// A uint8view
+    pub fn uint8view(&self) -> MemoryView<u8> {
+        self.view()
+    }
+
     pub(crate) fn from_vm_export(store: &Store, vm_memory: VMMemory) -> Self {
         Self {
             store: store.clone(),

lib/c-api/Cargo.toml

@@ -32,7 +32,7 @@ wasmer-engine-universal = { version = "2.0.0", path = "../engine-universal", opt
 wasmer-engine-dylib = { version = "2.0.0", path = "../engine-dylib", optional = true }
 wasmer-engine-staticlib = { version = "2.0.0", path = "../engine-staticlib", optional = true }
 wasmer-middlewares = { version = "2.0.0", path = "../middlewares", optional = true }
-wasmer-wasi = { version = "2.0.0", path = "../wasi", optional = true }
+wasmer-wasi = { version = "2.0.0", path = "../wasi", default-features = false, features = ["host_fs"], optional = true }
 wasmer-types = { version = "2.0.0", path = "../types" }
 enumset = "1.0"
 cfg-if = "1.0"

lib/c-api/src/wasm_c_api/wasi/capture_files.rs

@@ -1,12 +1,11 @@
 //! Default implementations for capturing the stdout/stderr output of a WASI program.
 
-use serde::{Deserialize, Serialize};
 use std::collections::VecDeque;
 use std::io::{self, Read, Seek, Write};
 use wasmer_wasi::{WasiFile, WasiFsError};
 
 /// For capturing stdout/stderr. Stores all output in a string.
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug)]
 pub struct OutputCapturer {
     pub(crate) buffer: VecDeque<u8>,
 }
@@ -19,7 +18,6 @@ impl OutputCapturer {
     }
 }
 
-#[typetag::serde]
 impl WasiFile for OutputCapturer {
     fn last_accessed(&self) -> u64 {
         0

lib/cli/Cargo.toml

@@ -35,11 +35,12 @@ wasmer-engine-universal = { version = "2.0.0", path = "../engine-universal", opt
 wasmer-engine-dylib = { version = "2.0.0", path = "../engine-dylib", optional = true }
 wasmer-engine-staticlib = { version = "2.0.0", path = "../engine-staticlib", optional = true }
 wasmer-vm = { version = "2.0.0", path = "../vm" }
-wasmer-wasi = { version = "2.0.0", path = "../wasi", default-features = false, optional = true }
+wasmer-wasi = { version = "2.0.0", path = "../wasi", default-features = false, features = ["host_fs"], optional = true }
 wasmer-wasi-experimental-io-devices = { version = "2.0.0", path = "../wasi-experimental-io-devices", optional = true }
 wasmer-wast = { version = "2.0.0", path = "../../tests/lib/wast", optional = true }
 wasmer-cache = { version = "2.0.0", path = "../cache", optional = true }
 wasmer-types = { version = "2.0.0", path = "../types" }
+wasmer-vfs  = { version = "2.0.0", path = "../vfs" }
 atty = "0.2"
 colored = "2.0"
 anyhow = "1.0"

lib/cli/src/commands/run.rs

@@ -64,6 +64,9 @@ pub struct Run {
     #[structopt(long = "debug", short = "d")]
     debug: bool,
 
+    #[structopt(short, long, parse(from_occurrences))]
+    verbose: u8,
+
     /// Application arguments
     #[structopt(name = "--", multiple = true)]
     args: Vec<String>,
@@ -74,7 +77,7 @@ impl Run {
     pub fn execute(&self) -> Result<()> {
         #[cfg(feature = "debug")]
         if self.debug {
-            logging::set_up_logging().unwrap();
+            logging::set_up_logging(self.verbose).unwrap();
         }
         self.inner_execute().with_context(|| {
             format!(

lib/cli/src/logging.rs

@@ -1,19 +1,27 @@
 //! Logging functions for the debug feature.
 use crate::utils::wasmer_should_print_color;
+use anyhow::Result;
 use fern::colors::{Color, ColoredLevelConfig};
 use std::time;
 
+/// The debug level
+pub type DebugLevel = log::LevelFilter;
+
 /// Subroutine to instantiate the loggers
-pub fn set_up_logging() -> Result<(), String> {
+pub fn set_up_logging(verbose: u8) -> Result<(), String> {
     let colors_line = ColoredLevelConfig::new()
         .error(Color::Red)
         .warn(Color::Yellow)
         .trace(Color::BrightBlack);
     let should_color = wasmer_should_print_color();
 
     let colors_level = colors_line.info(Color::Green);
+    let level = match verbose {
+        1 => DebugLevel::Debug,
+        2 | _ => DebugLevel::Trace,
+    };
     let dispatch = fern::Dispatch::new()
-        .level(log::LevelFilter::Debug)
+        .level(level)
         .chain({
             let base = if should_color {
                 fern::Dispatch::new().format(move |out, message, record| {