Merge pull request #334 from wasmerio/fs

Access a WASIX instance's filesystem

Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "wasmer-wasix-js"
+name = "wasmer-js"
 version = "0.0.0"
 authors = ["Syrus Akbary <syrus@wasmer.io>"]
 edition = "2021"
@@ -48,8 +48,14 @@ features = [
     "BlobPropertyBag",
     "console",
     "DedicatedWorkerGlobalScope",
+    "DomException",
     "ErrorEvent",
+    "File",
     "FileReader",
+    "FileSystemDirectoryHandle",
+    "FileSystemFileHandle",
+    "FileSystemGetDirectoryOptions",
+    "FileSystemHandle",
     "Headers",
     "MessageEvent",
     "Navigator",
@@ -63,6 +69,7 @@ features = [
     "RequestInit",
     "RequestMode",
     "Response",
+    "StorageManager",
     "Url",
     "WebSocket",
     "Window",
@@ -92,10 +99,10 @@ dwarf-debug-info = false
 wasm-opt = ["--enable-threads", "--enable-bulk-memory", "-Oz"]
 
 [patch.crates-io]
-virtual-net = { git = "https://github.com/wasmerio/wasmer", branch = "master" }
-virtual-fs = { git = "https://github.com/wasmerio/wasmer", branch = "master" }
-wasmer-wasix = { git = "https://github.com/wasmerio/wasmer", branch = "master" }
-wasmer = { git = "https://github.com/wasmerio/wasmer", branch = "master" }
+virtual-net = { git = "https://github.com/wasmerio/wasmer", branch = "wasi-runner-mount-fs-instances" }
+virtual-fs = { git = "https://github.com/wasmerio/wasmer", branch = "wasi-runner-mount-fs-instances" }
+wasmer-wasix = { git = "https://github.com/wasmerio/wasmer", branch = "wasi-runner-mount-fs-instances" }
+wasmer = { git = "https://github.com/wasmerio/wasmer", branch = "wasi-runner-mount-fs-instances" }
 # virtual-net = { path = "../wasmer/lib/virtual-net" }
 # virtual-fs = { path = "../wasmer/lib/virtual-fs" }
 # wasmer-wasix = { path = "../wasmer/lib/wasix" }

lib.ts

@@ -1,8 +1,8 @@
 import { Buffer } from "buffer";
-export * from "./pkg/wasmer_wasix_js";
+export * from "./pkg/wasmer_js";
 // @ts-ignore
-import load, { ThreadPoolWorker } from "./pkg/wasmer_wasix_js";
-import wasm_bytes from "./pkg/wasmer_wasix_js_bg.wasm";
+import load, { ThreadPoolWorker } from "./pkg/wasmer_js";
+import wasm_bytes from "./pkg/wasmer_js_bg.wasm";
 
 interface MimeBuffer extends Buffer {
 	type: string;

package.json

@@ -26,10 +26,10 @@
     "access": "public"
   },
   "scripts": {
-    "build": "wasm-pack build --release --target=web --weak-refs --no-pack && wasm-opt pkg/wasmer_wasix_js_bg.wasm -O2 -o pkg/wasmer_wasix_js_bg.wasm && rollup -c --environment BUILD:production",
+    "build": "wasm-pack build --release --target=web --weak-refs --no-pack && wasm-opt pkg/wasmer_js_bg.wasm -O2 -o pkg/wasmer_js_bg.wasm && rollup -c --environment BUILD:production",
     "build:dev": "wasm-pack build --dev --target=web --weak-refs --no-pack && rollup -c --environment BUILD:development",
     "dev": "rollup -c -w",
-    "test": "web-test-runner 'tests/**/*.test.ts' --node-resolve --esbuild-target auto --config ./web-dev-server.config.mjs",
+    "test": "web-test-runner --node-resolve --esbuild-target auto --config ./web-dev-server.config.mjs",
     "clean": "rimraf dist coverage pkg target"
   },
   "files": [

rollup.config.mjs

@@ -73,8 +73,8 @@ export default commandLineArgs => {
     const configs = [
         makeConfig(),
         {
-            input: "./pkg/wasmer_wasix_js.d.ts",
-            output: [{ file: "dist/pkg/wasmer_wasix_js.d.ts", format: "es" }],
+            input: "./pkg/wasmer_js.d.ts",
+            output: [{ file: "dist/pkg/wasmer_js.d.ts", format: "es" }],
             plugins: [dts()],
         }
     ];

src/facade.rs

@@ -137,6 +137,10 @@ impl SpawnConfig {
         let env = self.parse_env()?;
         runner.set_envs(env);
 
+        for (dest, dir) in self.mounted_directories()? {
+            runner.mount(dest, Arc::new(dir));
+        }
+
         if let Some(uses) = self.uses() {
             let uses = crate::utils::js_string_array(uses)?;
             let packages = load_injected_packages(uses, runtime).await?;