Bundle WASi component adapter for preview1 modules

Author: kateinoigakukun

lib/ruby_wasm.rb

@@ -4,6 +4,7 @@
 require_relative "ruby_wasm/util"
 require_relative "ruby_wasm/build"
 require_relative "ruby_wasm/packager"
+require_relative "ruby_wasm/packager/component_adapter"
 require_relative "ruby_wasm/packager/file_system"
 require_relative "ruby_wasm/packager/core"
 

lib/ruby_wasm/packager/component_adapter.rb

@@ -0,0 +1,14 @@
+module RubyWasm::Packager::ComponentAdapter
+  module_function
+
+  # The path to the component adapter for the given WASI execution model.
+  #
+  # @param exec_model [String] "command" or "reactor"
+  def wasi_snapshot_preview1(exec_model)
+    File.join(
+      File.dirname(__FILE__),
+      "component_adapter",
+      "wasi_snapshot_preview1.#{exec_model}.wasm"
+    )
+  end
+end

lib/ruby_wasm/packager/component_adapter/wasi_snapshot_preview1.command.wasm

@@ -113,10 +113,12 @@ def link_exts(executor, build)
       ]
 
       wasi_libc_shared_libs.each do |lib|
-        wasi_sdk_path = build.toolchain.wasi_sdk_path
+        # @type var toolchain: RubyWasm::WASISDK
+        toolchain = build.toolchain
+        wasi_sdk_path = toolchain.wasi_sdk_path
         libraries << File.join(wasi_sdk_path, "share/wasi-sysroot/lib/wasm32-wasi", lib)
       end
-      wasi_adapter = ENV["WASI_COMPONENT_ADAPTER"] or raise "WASI_COMPONENT_ADAPTER is not set"
+      wasi_adapter = RubyWasm::Packager::ComponentAdapter.wasi_snapshot_preview1("command")
       adapters = [wasi_adapter]
       dl_openable_libs = Dir.glob(File.join(ruby_root, "usr", "local", "lib", "ruby", "**", "*.so"))
       linker = RubyWasmExt::ComponentLink.new
@@ -127,22 +129,16 @@ def link_exts(executor, build)
       libraries.each do |lib|
         # Non-DL openable libraries should be referenced as base name
         lib_name = File.basename(lib)
+        # @type var module_bytes: Array[Integer]
         module_bytes = File.binread(lib).unpack("C*")
         RubyWasm.logger.info "Linking #{lib_name} (#{module_bytes.size} bytes)"
         linker.library(lib_name, module_bytes, false)
       end
 
-      filter_libs = [
-        "enc/encdb.so",
-        "stringio.so",
-        "monitor.so",
-        "pathname.so",
-        "strscan.so",
-      ]
       dl_openable_libs.each do |lib|
         # DL openable lib_name should be a relative path from ruby_root
         lib_name = "/" + Pathname.new(lib).relative_path_from(Pathname.new(ruby_root)).to_s
-        # next unless filter_libs.any? { |filter| lib_name.include?(filter) }
+        # @type var module_bytes: Array[Integer]
         module_bytes = File.binread(lib).unpack("C*")
         RubyWasm.logger.info "Linking #{lib_name} (#{module_bytes.size} bytes)"
         linker.library(lib_name, module_bytes, true)
@@ -152,7 +148,9 @@ def link_exts(executor, build)
         adapter_name = File.basename(adapter)
         # e.g. wasi_snapshot_preview1.command.wasm -> wasi_snapshot_preview1
         adapter_name = adapter_name.split(".")[0]
-        linker.adapter(adapter_name, File.binread(adapter).unpack("C*"))
+        # @type var module_bytes: Array[Integer]
+        module_bytes = File.binread(adapter).unpack("C*")
+        linker.adapter(adapter_name, module_bytes)
       end
       return linker.encode()
     end

lib/ruby_wasm/packager/component_adapter/wasi_snapshot_preview1.reactor.wasm

@@ -154,3 +154,12 @@ namespace :standalone do
     end
   end
 end
+
+namespace :gem do
+  task :update_component_adapters do
+    ["command", "reactor"].each do |exec_model|
+      sh "curl", "-L", "-o", "lib/ruby_wasm/packager/component_adapter/wasi_snapshot_preview1.#{exec_model}.wasm",
+          "https://github.com/bytecodealliance/wasmtime/releases/download/v19.0.1/wasi_snapshot_preview1.#{exec_model}.wasm"
+    end
+  end
+end

lib/ruby_wasm/packager/core.rb

@@ -48,6 +48,7 @@ class RubyWasm::Packager
     @packager: RubyWasm::Packager
     def initialize: (RubyWasm::Packager) -> void
     def build: (RubyWasm::BuildExecutor, untyped options) -> String
+    def build_and_link_exts: (RubyWasm::BuildExecutor) -> Array[Integer]
 
     extend Forwardable
 
@@ -63,13 +64,16 @@ class RubyWasm::Packager
       def initialize: (RubyWasm::Packager) -> void
       def build: (RubyWasm::BuildExecutor, untyped options) -> String
       def specs_with_extensions: () -> Array[[untyped, Array[string]]]
+      def build_and_link_exts: (RubyWasm::BuildExecutor) -> void
     end
 
     class DynamicLinking < RubyWasm::Packager::Core::BuildStrategy
       @build: RubyWasm::Build
       def derive_build: () -> RubyWasm::Build
       def build_exts: (RubyWasm::BuildExecutor, RubyWasm::Build) -> void
       def name: () -> string
+
+      private def link_exts: (RubyWasm::BuildExecutor, RubyWasm::Build) -> Array[Integer]
     end
 
     class StaticLinking < RubyWasm::Packager::Core::BuildStrategy
@@ -109,4 +113,8 @@ class RubyWasm::Packager
     def ruby_version: () -> String
     def rubyarchdir: () -> String
   end
+
+  module ComponentAdapter
+    def self.wasi_snapshot_preview1: (String exec_model) -> String
+  end
 end