Merge pull request #438 from ruby/katei/update-bjorn-wasi

Allow to read/write on in-memory file system on Web browser

Author: kateinoigakukun

package-lock.json

@@ -53,7 +53,7 @@
     "build": "npm run build:rollup && npm run build:tsc && npm run build:static && ./tools/post-build.sh ./dist"
   },
   "devDependencies": {
-    "@bjorn3/browser_wasi_shim": "^0.2.19",
+    "@bjorn3/browser_wasi_shim": "^0.3.0",
     "@bytecodealliance/jco": "../../../vendor/jco",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-typescript": "^11.1.6",

packages/npm-packages/ruby-wasm-wasi/package.json

@@ -1,4 +1,4 @@
-import { Fd, WASI } from "@bjorn3/browser_wasi_shim";
+import { Fd, File, OpenFile, PreopenDirectory, WASI } from "@bjorn3/browser_wasi_shim";
 import { consolePrinter } from "./console.js";
 import { RubyVM } from "./vm.js";
 
@@ -18,7 +18,12 @@ export const DefaultRubyVM = async (
     ([k, v]) => `${k}=${v}`,
   );
 
-  const fds: Fd[] = [];
+  const fds: Fd[] = [
+    new OpenFile(new File([])),
+    new OpenFile(new File([])),
+    new OpenFile(new File([])),
+    new PreopenDirectory("/", new Map()),
+  ];
   const wasi = new WASI(args, env, fds, { debug: false });
   const vm = new RubyVM();
 

packages/npm-packages/ruby-wasm-wasi/src/browser.ts

@@ -0,0 +1,33 @@
+import { test, expect, Page } from "@playwright/test";
+
+import {
+  setupDebugLog,
+  setupProxy,
+  setupUncaughtExceptionRejection,
+  resolveBinding,
+} from "../support";
+
+if (!process.env.RUBY_NPM_PACKAGE_ROOT) {
+  test.skip("skip", () => {});
+} else {
+  test.beforeEach(async ({ context, page }) => {
+    setupDebugLog(context);
+    setupProxy(context);
+    setupUncaughtExceptionRejection(page);
+  });
+
+  test.describe('WASI browser binding', () => {
+    test("Read/write on in-memory file system", async ({ page }) => {
+      const resolve = await resolveBinding(page, "checkResolved");
+      await page.setContent(`
+      <script src="https://cdn.jsdelivr.net/npm/@ruby/head-wasm-wasi@latest/dist/browser.script.iife.js"></script>
+      <script type="text/ruby" data-eval="async">
+      require "js"
+      File.write("hello.txt", "Hello, world!")
+      JS.global.checkResolved File.read("hello.txt")
+      </script>
+    `);
+      expect(await resolve()).toBe("Hello, world!");
+    });
+  });
+}

packages/npm-packages/ruby-wasm-wasi/test-e2e/integrations/wasi-binding.spec.ts

@@ -68,17 +68,22 @@ const instantiateWasmerWasi = async (rootTestFile) => {
     return files.flat();
   };
 
-  const __root__ = new browserWasi.Directory({});
+  const __root__ = new browserWasi.Directory(new Map());
   const writeMemFs = (guestPath, contents) => {
     const dirname = path.dirname(guestPath);
     const parts = dirname.split('/');
     let current = __root__;
     for (let i = 1; i < parts.length; i++) {
-      const dir = current.create_entry_for_path(parts[i], /* is_dir */ true);
-      current = dir;
+      const existing = current.contents.get(parts[i]);
+      if (existing) {
+        current = existing;
+      } else {
+        const { entry: created } = current.create_entry_for_path(parts[i], /* is_dir */ true);
+        current = created;
+      }
     }
     const basename = path.basename(guestPath);
-    const file = current.create_entry_for_path(basename, /* is_dir */ false)
+    const { entry: file } = current.create_entry_for_path(basename, /* is_dir */ false)
     file.data = contents;
   };
   const loadToMemFs = async (guestPath, hostPath) => {