wasval 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c40e62ec75efb8c895a87bdf907ffe4e339d1954e5e4ea7368e2652732e3156
-  data.tar.gz: 964d7ad7932d2fe91a8e27a87a188ac54a0de84eb008407da778bab3c13f6d3a
+  metadata.gz: 51ff6fbf16b70ddb40f11ff08c901eb580276c667d3477aec4cf30de524abe81
+  data.tar.gz: d859cac0bad0f52c865105abb4749799453f618e7f3eb66b45043de172085f81
 SHA512:
-  metadata.gz: ab1cbfd5146a97b4c06852070840a20060b1101ee6d28a27f98f0c5fdfaa68979c198c03c88abefa0ec7fa9d6483defe8be58002f2a8d2cdc04820ebc900baf9
-  data.tar.gz: 9523a2fd9f67374216d3f3d5a5f4d1e8072e821a2563b777522f21ef20d07c8004b3ffeedf0aeec6dad7d19809f2a20140b8d0ec775808f583e8142211f17627
+  metadata.gz: c5e2c5b5c54127f9d8b4e517b3d68a9764e7a758934f0055317d8e52de355e33a985edbbb2ce1e61271955b1537672a6264b2f7375b5e57430e79d16ba307444
+  data.tar.gz: fd4aee2c209d178e182bb5655c895d72c2e809cf3db46ed3618900dac4becbdc5a9d7b82c245d8a6c4b9bef56e33cd3d47ac1496f74a3fc431c7e1c58a49def1

data/README.md

@@ -50,6 +50,36 @@ You can customize the destination via the `WASVAL_RUBY_WASM_PATH` environment va
 Wasval::Install::RubyWasm.new(dest: "/path/to/ruby.wasm").download
 ```
 
+### Bundling gems into the binary (`include_gems`)
+
+By default, the installed `ruby.wasm` binary does not include the standard library or gems, so `require` calls inside the sandbox will fail. To bundle the standard library (and any gems installed in the `usr` directory of the tarball) into the binary, use the `include_gems: true` option:
+
+```ruby
+Wasval::Install::RubyWasm.new(
+  include_gems: true,
+  pack_output: "/path/to/ruby-packed.wasm",
+  serialized_dest: "/path/to/ruby.cwasm"
+).install
+```
+
+This extracts the `usr` directory from the downloaded tarball, packs it into the binary via `rbwasm pack`, and serializes the result. The packed binary is written to `pack_output` (defaults to `~/.wasval/ruby-packed.wasm`), and the serialized module is written to `serialized_dest`.
+
+If you have a pre-existing `usr` directory (e.g. with additional gems installed), pass its path via `include_gems:`:
+
+```ruby
+Wasval::Install::RubyWasm.new(
+  include_gems: true,
+  include_gems: "/path/to/usr"
+).install
+```
+
+After installing with `include_gems: true`, point `WASVAL_RUBY_CWASM_PATH` to the serialized binary and `require` will work inside the sandbox:
+
+```ruby
+result = Wasval.execute("require 'json'; JSON.parse('1')")
+result.status  # => :success
+```
+
 ## Usage
 
 Set the `WASVAL_RUBY_WASM_PATH` environment variable to point to the `ruby.wasm` binary, then execute Ruby code:
@@ -67,7 +97,7 @@ result.success?      # => true
 ```ruby
 Wasval.configure do |config|
   config.timeout      = 10   # seconds (default: 5)
-  config.memory_limit = 256  # MB (default: 128)
+  config.memory_limit = 32 # MB (default: 16)
 end
 ```
 

data/lib/wasval/config.rb

@@ -3,7 +3,7 @@
 module Wasval
   class Config
     DEFAULT_TIMEOUT = 5
-    DEFAULT_MEMORY_LIMIT = 128
+    DEFAULT_MEMORY_LIMIT = 16
 
     attr_accessor :timeout, :memory_limit
 

data/lib/wasval/executor.rb

@@ -19,6 +19,9 @@ module Wasval
       else
         raise ArgumentError.new "Please specify 'WASVAL_RUBY_WASM_PATH' or 'WASVAL_RUBY_CWASM_PATH' env"
       end
+
+      @engine.start_epoch_interval(1000)
+      @baseline_memory_mb = measure_startup_memory_mb
     end
 
     def execute(code:, timeout:, memory_limit:)
@@ -42,15 +45,13 @@ module Wasval
 
       store = Wasmtime::Store.new(@engine,
         wasi_p1_config: wasi_config,
-        limits: { memory_size: memory_limit * 1024 * 1024 }
+        limits: { memory_size: (@baseline_memory_mb + memory_limit) * 1024 * 1024 }
       )
       store.set_epoch_deadline(timeout)
 
       linker = Wasmtime::Linker.new(@engine)
       Wasmtime::WASI::P1.add_to_linker_sync(linker)
 
-      @engine.start_epoch_interval(1000)
-
       begin
         linker.instantiate(store, @mod).invoke("_start")
         classify_output(stdout_buf, stderr_buf, store)
@@ -77,6 +78,32 @@ module Wasval
 
     private
 
+    def measure_startup_memory_mb
+      stdout_buf = +""
+      stderr_buf = +""
+      wasi_config = Wasmtime::WasiConfig.new
+        .set_argv(["ruby", "-"])
+        .set_stdin_string("")
+        .set_stdout_buffer(stdout_buf, 1024)
+        .set_stderr_buffer(stderr_buf, 1024)
+
+      probe_store = Wasmtime::Store.new(@engine,
+        wasi_p1_config: wasi_config,
+        limits: { memory_size: 512 * 1024 * 1024 }
+      )
+      probe_store.set_epoch_deadline(30)
+
+      linker = Wasmtime::Linker.new(@engine)
+      Wasmtime::WASI::P1.add_to_linker_sync(linker)
+
+      begin
+        linker.instantiate(probe_store, @mod).invoke("_start")
+      rescue Wasmtime::WasiExit
+      end
+
+      (probe_store.max_linear_memory_consumed.to_f / (1024 * 1024)).ceil
+    end
+
     def wrapped_code(code)
       <<~RUBY
         begin

data/lib/wasval/install/ruby_wasm.rb

@@ -17,14 +17,19 @@ module Wasval
       DEFAULT_INSTALL_DIR = File.expand_path("~/.wasval")
       DEFAULT_BINARY_NAME = "ruby.wasm"
       DEFAULT_SERIALIZED_BINARY_NAME = "ruby.cwasm"
+      DEFAULT_PACKED_BINARY_NAME = "ruby-packed.wasm"
+      DEFAULT_USR_DIR_NAME = "usr"
 
-      attr_reader :dest, :serialized_dest, :ruby_version, :profile
+      attr_reader :dest, :serialized_dest, :ruby_version, :profile, :pack_dirs, :pack_output, :include_gems
 
-      def initialize(dest: nil, serialized_dest: nil, ruby_version: nil, profile: :full)
+      def initialize(dest: nil, serialized_dest: nil, ruby_version: nil, profile: :full, pack_dirs: nil, pack_output: nil, include_gems: nil)
         @ruby_version = ruby_version || ENV["WASVAL_RUBY_VERSION"] || default_ruby_version
         @profile = profile.to_s
         @dest = dest || ENV["WASVAL_RUBY_WASM_PATH"] || File.join(DEFAULT_INSTALL_DIR, DEFAULT_BINARY_NAME)
         @serialized_dest = serialized_dest || ENV["WASVAL_RUBY_CWASM_PATH"] || File.join(File.dirname(@dest), DEFAULT_SERIALIZED_BINARY_NAME)
+        @pack_dirs = pack_dirs
+        @pack_output = pack_output || File.join(File.dirname(@dest), DEFAULT_PACKED_BINARY_NAME)
+        @include_gems = include_gems
       end
 
       def download
@@ -38,18 +43,49 @@ module Wasval
       end
 
       def install
-        download
+        FileUtils.mkdir_p(File.dirname(dest))
+        Dir.mktmpdir do |tmpdir|
+          tarball_path = File.join(tmpdir, tarball_name)
+          download_file(download_url, tarball_path)
+          extract_binary(tarball_path)
+          if pack_dirs || include_gems
+            dirs = pack_dirs ? pack_dirs.dup : []
+            if include_gems
+              if include_gems == true
+                actual_usr_dir = File.join(tmpdir, DEFAULT_USR_DIR_NAME)
+                extract_usr_dir(tarball_path, actual_usr_dir)
+              else
+                actual_usr_dir = include_gems
+              end
+              dirs << actual_usr_dir
+            end
+            pack(*dirs, output: pack_output) if dirs.any?
+          end
+        end
         serialize
       end
 
       def serialize
         engine = Wasmtime::Engine.new(epoch_interruption: true)
-        mod = Wasmtime::Module.from_file(engine, dest)
+        source = (pack_dirs || include_gems) ? pack_output : dest
+        mod = Wasmtime::Module.from_file(engine, source)
         FileUtils.mkdir_p(File.dirname(serialized_dest))
         File.binwrite(serialized_dest, mod.serialize)
         serialized_dest
       end
 
+      def pack(*dirs, output:)
+        args = [dest]
+        dirs.each do |dir|
+          dir_arg = dir.include?("::") ? dir : "#{dir}::/#{File.basename(dir)}"
+          args.push("--dir", dir_arg)
+        end
+        args.push("-o", output)
+
+        system("rbwasm", "pack", *args, exception: true)
+        output
+      end
+
       def installed?
         File.exist?(dest)
       end
@@ -88,6 +124,16 @@ module Wasval
         end
       end
 
+      def extract_usr_dir(tarball_path, dest_usr_dir)
+        Dir.mktmpdir do |extract_dir|
+          system("tar", "-xzf", tarball_path, "-C", extract_dir, exception: true)
+          src_usr = Dir.glob("#{extract_dir}/**/usr").min_by(&:length)
+          raise "usr directory not found in tarball" unless src_usr && File.directory?(src_usr)
+          FileUtils.cp_r(src_usr, File.dirname(dest_usr_dir))
+        end
+        dest_usr_dir
+      end
+
       def extract_binary(tarball_path)
         Zlib::GzipReader.open(tarball_path) do |gz|
           Gem::Package::TarReader.new(gz) do |tar|

data/lib/wasval/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Wasval
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wasval
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Yuji Yaginuma
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Execute 'eval' in a WASM runtime
 test_files: []