fix: upgrade wasi shim and use wasi stdout/stderr

Author: palkan

package.json

@@ -10,7 +10,7 @@
     "dev": "npm-run-all --parallel watch:*"
   },
   "dependencies": {
-    "@bjorn3/browser_wasi_shim": "^0.2.18",
+    "@bjorn3/browser_wasi_shim": "^0.2.19",
     "@ruby/wasm-wasi": "^2.4.1",
     "@shoelace-style/shoelace": "^2.13.0",
     "monaco-editor": "^0.45.0"

src/app.js

@@ -94,8 +94,7 @@ export default class App {
         const newSource = this.transpile(this.codeEditor.getValue());
         this.previewEditor.setValue(newSource);
 
-        const result = this.execute(newSource);
-        let output = window.$puts.flush();
+        let { result, output } = this.executeWithOutput(newSource);
 
         if (result) output += "\n\n> " + result;
 
@@ -233,6 +232,13 @@ export default class App {
     }
   }
 
+  executeWithOutput(source) {
+    this.vm.$output.flush();
+    const result = this.execute(source);
+    const output = this.vm.$output.flush();
+    return { result, output };
+  }
+
   async setCurrentVMVersion() {
     const versionContainer = document.getElementById("currentVersion");
     if (!versionContainer) return;
@@ -286,7 +292,7 @@ export default class App {
   }
 
   onSelectEditor(e) {
-    if (!e.target.value) return;
+    if (!e.target.value || !e.target.value.match(/Editor$/)) return;
 
     this.showEditor(e.target.value);
   }

src/vm.js

@@ -1,43 +1,55 @@
-import { DefaultRubyVM } from "@ruby/wasm-wasi/dist/browser";
+import { RubyVM } from "@ruby/wasm-wasi";
+import { File, WASI, OpenFile, ConsoleStdout } from "@bjorn3/browser_wasi_shim";
+
 import ruby from "./ruby.wasm";
 
 export default async function initVM() {
   const module = await ruby();
 
   const output = [];
-  const originalLog = console.log;
-  window.$puts = function (val) {
-    originalLog(val);
+  output.flush = function () {
+    return this.splice(0, this.length).join("\n");
+  };
+
+  const setStdout = function (val) {
+    console.log(val);
     output.push(val);
   };
 
-  const { vm } = await DefaultRubyVM(module);
+  const setStderr = function (val) {
+    console.warn(val);
+    output.push(`[warn] ${val}`);
+  };
+
+  const fds = [
+    new OpenFile(new File([])),
+    ConsoleStdout.lineBuffered(setStdout),
+    ConsoleStdout.lineBuffered(setStderr),
+  ];
+  const wasi = new WASI([], [], fds, { debug: false });
+  const vm = new RubyVM();
+  const imports = {
+    wasi_snapshot_preview1: wasi.wasiImport,
+  };
+  vm.addToImports(imports);
+
+  const instance = await WebAssembly.instantiate(module, imports);
+  await vm.setInstance(instance);
 
-  window.$puts.flush = () => output.splice(0, output.length).join("\n");
+  wasi.initialize(instance);
+  vm.initialize();
+  vm.$output = output;
 
   vm.eval(`
     require "/bundle/setup"
     require "rubygems"
 
     require "js"
 
-    module Kernel
-      def puts(val)
-        JS.eval("window.$puts('#{val.inspect}')")
-        nil
-      end
-
-      def p(val)
-        JS.eval("window.$puts('#{val}')")
-        nil
-      end
-    end
-
     require "ruby-next/language"
     require "ruby-next/language/rewriters/edge"
     require "ruby-next/language/rewriters/proposed"
 
-
     module RubyNext
       class << self
         attr_accessor :custom_rewriters

yarn.lock

@@ -7,10 +7,10 @@
   resolved "https://registry.yarnpkg.com/@alloc/quick-lru/-/quick-lru-5.2.0.tgz#7bf68b20c0a350f936915fcae06f58e32007ce30"
   integrity sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==
 
-"@bjorn3/browser_wasi_shim@^0.2.18":
-  version "0.2.18"
-  resolved "https://registry.yarnpkg.com/@bjorn3/browser_wasi_shim/-/browser_wasi_shim-0.2.18.tgz#7b4274802625b58adb52b1363357af660767b963"
-  integrity sha512-oTArSGucj3UVfzyfVX1PH0/d94XiZpRu0c0grLTv0RHjlpTqsSeqONE6se/pS03ydKFvs90liMEVD0+ZKG/9SA==
+"@bjorn3/browser_wasi_shim@^0.2.19":
+  version "0.2.19"
+  resolved "https://registry.yarnpkg.com/@bjorn3/browser_wasi_shim/-/browser_wasi_shim-0.2.19.tgz#24b6dc7417677b641da6f0a24729b6d7766e0c5b"
+  integrity sha512-Zu5KVxRp7MBwwdOtXSmu14NUwPASNE6zK/BSwWKf0Fsc4g5NOqPYto5C0Nc6EixDb0AEXCoLFDMKP9RN7n2yPQ==
 
 "@ctrl/tinycolor@^4.0.2":
   version "4.0.3"