rubyboy 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f029df58812310dc308546c77d25e75496e0e7b0aff605a5d0826deba85d9014
-  data.tar.gz: c2fffa4e8f4535ae4fad4bdf3c5742f569443fffc925ee02fa06f6b268f5e2c4
+  metadata.gz: 8f272f80eda6bc8a180619d01183ddeecc4b8f288b1e182983bee8b4ddaec51c
+  data.tar.gz: c05b9f8e41193fb6c21c928e6bd4b2c4dc1de8d2f5264203cbe9d36be1fc9ede
 SHA512:
-  metadata.gz: c7f5d75b7ae8ec29488242943aca521b013875c896c8b368622f02408f52803b01e94b548b720fb4bad1ffca30d4223cfbf15ab2e8bd04b89799dc2a41bcf164
-  data.tar.gz: b21b63a6c19263c3a72aa9b592505358dc55f450b0fd9fd3c8fb8b907d2057c07b2dae41dc9c0fa1be2fcd4e77010d4dcaf8ca7eafab908f27f7b5d903596a69
+  metadata.gz: 5d33f763fc53d97c0cbc572ceb85f8f5eae609f1dde6fdade9da8a736461cb7e43ffa7131506a748cee86b046e6e2adc930a8d3877a1f15693d21c8f4b8b2e58
+  data.tar.gz: 55e3f162ba70d59c89ad1a2399c20011dc51af7fb22afeb121317ef94bee0c745492fa10c073dc545bb85d1b443af2c52295a93711ffc73124890f1b9cf69e3e

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+## [1.4.2] - 2025-01-11
+
+- Use DefaultRubyVM
+- Bump ruby.wasm version to 2.7.0
+
 ## [1.4.1] - 2024-12-25
 
 - PPU performance optimization through data caching and pixel format changes

data/docs/worker.js

@@ -1,5 +1,5 @@
-import { RubyVM } from 'https://cdn.jsdelivr.net/npm/@ruby/wasm-wasi@2.6.2/+esm';
-import { Directory, File, OpenDirectory, OpenFile, PreopenDirectory, WASI } from 'https://cdn.jsdelivr.net/npm/@bjorn3/browser_wasi_shim@0.3.0/+esm';
+import { DefaultRubyVM } from 'https://cdn.jsdelivr.net/npm/@ruby/wasm-wasi@2.7.0/dist/browser/+esm';
+import { File } from 'https://cdn.jsdelivr.net/npm/@bjorn3/browser_wasi_shim@0.3.0/+esm';
 
 const DIRECTION_KEY_MASKS = {
   'KeyD': 0b0001, // Right
@@ -19,20 +19,6 @@ class Rubyboy {
   constructor() {
     this.wasmUrl = 'https://proxy.sacckey.dev/rubyboy.wasm';
 
-    const rootContents = new Map();
-    rootContents.set('RUBYBOY_TMP', new Directory(new Map()));
-    this.rootFs = rootContents;
-
-    const args = ['ruby.wasm', '-e_=0'];
-    this.wasi = new WASI(args, [], [
-      new OpenFile(new File([])), // stdin
-      new OpenFile(new File([])), // stdout
-      new OpenFile(new File([])), // stderr
-      new PreopenDirectory('/', rootContents)
-    ], {
-      debug: false
-    });
-
     this.directionKey = 0b1111;
     this.actionKey = 0b1111;
   }
@@ -43,18 +29,8 @@ class Rubyboy {
       response = await fetch(this.wasmUrl);
     }
 
-    const buffer = await response.arrayBuffer();
-    const imports = {
-      wasi_snapshot_preview1: this.wasi.wasiImport,
-    };
-    const vm = new RubyVM();
-    vm.addToImports(imports);
-
-    const { instance } = await WebAssembly.instantiate(buffer, imports);
-    await vm.setInstance(instance);
-    this.wasi.initialize(instance);
-    vm.initialize();
-
+    const module = await WebAssembly.compileStreaming(response)
+    const { vm, wasi } = await DefaultRubyVM(module);
     vm.eval(`
       require 'js'
       require_relative 'lib/executor'
@@ -63,15 +39,13 @@ class Rubyboy {
     `);
 
     this.vm = vm;
+    this.rootDir = wasi.fds[3].dir
   }
 
   sendPixelData() {
     this.vm.eval(`$executor.exec(${this.directionKey}, ${this.actionKey})`);
 
-    const tmpDir = this.rootFs.get('RUBYBOY_TMP');
-    const op = new OpenDirectory(tmpDir);
-    const result = op.path_lookup('video.data', 0);
-    const file = result.inode_obj;
+    const file = this.rootDir.contents.get('video.data');
     const bytes = file.data;
 
     postMessage({ type: 'pixelData', data: bytes.buffer }, [bytes.buffer]);
@@ -127,8 +101,7 @@ self.addEventListener('message', async (event) => {
 
   if (event.data.type === 'loadROM') {
     const romFile = new File(new Uint8Array(event.data.data));
-    const tmpDir = rubyboy.rootFs.get('RUBYBOY_TMP');
-    tmpDir.contents.set('rom.data', romFile);
+    rubyboy.rootDir.contents.set('rom.data', romFile);
     rubyboy.vm.eval(`
       $executor.read_rom_from_virtual_fs
     `);

data/lib/executor.rb

@@ -15,11 +15,11 @@ class Executor
 
   def exec(direction_key = 0b1111, action_key = 0b1111)
     bin = @emulator.step(direction_key, action_key).pack('V*')
-    File.binwrite(File.join('/RUBYBOY_TMP', 'video.data'), bin)
+    File.binwrite('/video.data', bin)
   end
 
   def read_rom_from_virtual_fs
-    rom_path = '/RUBYBOY_TMP/rom.data'
+    rom_path = '/rom.data'
     raise "ROM file not found in virtual filesystem at #{rom_path}" unless File.exist?(rom_path)
 
     rom_data = File.open(rom_path, 'rb') { |file| file.read.bytes }

data/lib/rubyboy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rubyboy
-  VERSION = '1.4.1'
+  VERSION = '1.4.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyboy
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - sacckey
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-25 00:00:00.000000000 Z
+date: 2025-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi