wasmify-rails 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f126390207e5e9030c599cffebf5e9cd14b701e960acaf3a81c0e868f20cef2
-  data.tar.gz: aa1e772419cedf0b6dc3f786103a43b99aa4d6faea0c32df1e029a4b102ad0df
+  metadata.gz: 6da25bdd1a3e205a57b7081ada2a29997e4cf5df306423695564aba47591efb3
+  data.tar.gz: d7e72fc5aed555d506086f267cba686560357c3a478015b891d15e9b613cb26f
 SHA512:
-  metadata.gz: 651e0e83708072e63098bf1199456866a0bb1f2256c1815101cb0028adf6742ad3ea1feee52e65f272a85eacb1f5f839c8c46340e1c67b34500a6e0a08f503e6
-  data.tar.gz: a9d623bf6faed1db405f6daba055a69ab2d2ea4178fc2926901f51be875537a133c0b966f95e63e89f555086ef950d08a7fe996543e6b84f418daa0b39957b17
+  metadata.gz: 650516f17e4f8fc0a02f5b6515d23634f8ac47dd14d5faecb0bd932d74994b7a1b9127a50143b46dd97d1d1c6f5b3e7fbba1146306cc9f099dcb44542945c643
+  data.tar.gz: ac1d4ef0047666f1e7e52e935f3c78dcb596c4c064b7bd7f5ace46ccc8eef56f555f7db4e90d52da50b469f64587a8e4766a47f31e7caed0e3976c35b9573cec

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## master
 
+## 0.3.2
+
+- Add `Rack::WASI::IncomingHandler` mimicking `wasi/http:proxy` interface.
+
+## 0.3.1
+
+- Use latest patch versions for Ruby 3.3 and 3.4.
+
 ## 0.3.0
 
 - Add `ignore_gem_extensions` configuration option.

data/lib/active_record/connection_adapters/nulldb_adapter/core.rb

@@ -325,7 +325,7 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter < ActiveRecord::Connection
 
   def new_table_definition(adapter = nil, table_name = nil, is_temporary = nil, options = {})
     case ::ActiveRecord::VERSION::MAJOR
-    when 6, 7
+    when 6, 7, 8
       TableDefinition.new(self, table_name, temporary: is_temporary, options: options.except(:id))
     when 5
       TableDefinition.new(table_name, is_temporary, options.except(:id), nil)

data/lib/active_record/connection_adapters/sqlite3_wasm_adapter.rb

@@ -52,6 +52,8 @@ module ActiveRecord
 
         def busy_timeout(...) = nil
 
+        def busy_handler_timeout=(...) = nil
+
         def execute(sql)
           @last_statement = Statement.new(self, sql)
           @last_statement.result

data/lib/rack/data_uri_uploads.rb

@@ -19,7 +19,9 @@ module Rack
 
       request = Rack::Request.new(env)
 
-      if request.post? || request.put? || request.patch?
+      if (
+        request.post? || request.put? || request.patch?
+      ) && request.get_header("HTTP_CONTENT_TYPE").match?(%r{multipart/form-data})
         transform_params(request.params)
         env["action_dispatch.request.request_parameters"] = request.params
       end

data/lib/rack/wasi/incoming_handler.rb

@@ -0,0 +1,182 @@
+# frozen_string_literal: true
+
+require "stringio"
+require "uri"
+require "base64"
+require "rack"
+require "rack/test"
+
+require "rack/data_uri_uploads"
+
+module Rack
+  module WASI
+    class Result < Data.define(:value, :error)
+      def tag = error ? "error" : "ok"
+    end
+
+    #  resource incoming-request {
+    #    method: func() -> method;
+    #    path-with-query: func() -> option<string>;
+    #    scheme: func() -> option<scheme>;
+    #    authority: func() -> option<string>;
+    #    headers: func() -> headers;
+    #    consume: func() -> result<incoming-body>;
+    # }
+    # https://github.com/WebAssembly/wasi-http/blob/d163277b8684483a2334363ca1492ca298ea526d/wit/types.wit#L274
+    class IncomingRequest
+      # We use a reference to the global JS object to access the incoming request data.
+      def initialize(js_object_id)
+        @js_object = ::JS.global[js_object_id]
+      end
+
+      def method = @js_object.call(:method).to_s
+
+      def path_with_query
+        path = @js_object.call(:pathWithQuery)
+        if path.typeof == "string"
+          path.to_s
+        end
+      end
+
+      def scheme
+        sch = @js_object.call(:scheme)
+        if sch.typeof == "string"
+          sch.to_s
+        end
+      end
+
+      def authority
+        auth = @js_object.call(:authority)
+        if auth.typeof == "string"
+          auth.to_s
+        end
+      end
+
+      def headers
+        entries = ::JS.global[:Object].entries(@js_object.call(:headers))
+        entries.to_a.each.with_object({}) do |entry_val, acc|
+          key, val = entry_val.to_a
+          acc[key.to_s] = val.to_s
+          acc
+        end
+      end
+
+      # NOTE: Currently, we only support text bodies
+      def consume
+        body = @js_object.call(:consume)
+        if body.typeof == "string"
+          body.to_s
+        end
+      end
+    end
+
+    #  resource response-outparam {
+    #    set: static func(
+    #      param: response-outparam,
+    #      response: result<outgoing-response, error-code>,
+    #    );
+    #  }
+    #
+    # https://github.com/WebAssembly/wasi-http/blob/d163277b8684483a2334363ca1492ca298ea526d/wit/types.wit#L437
+    class ResponseOutparam
+      # We use a reference to the global JS object to access the incoming request data
+      def initialize(js_object_id)
+        @js_object = ::JS.global[js_object_id]
+      end
+
+      def set(result)
+        @js_object.call(:set, ::JS::Object.wrap(result))
+      end
+    end
+
+    #  resource outgoing-response {
+    #    constructor(headers: headers);
+    #    status-code: func() -> status-code;
+    #    set-status-code: func(status-code: status-code) -> result;
+    #    headers: func() -> headers;
+    #    body: func() -> result<outgoing-body>;
+    #  }
+    #
+    #  resource outgoing-body {
+    #    write: func() -> result<output-stream>;
+    #    finish: static func(
+    #        this: outgoing-body,
+    #        trailers: option<trailers>
+    #      ) -> result<_, error-code>;
+    #    }
+    #  }
+    #
+    # https://github.com/WebAssembly/wasi-http/blob/d163277b8684483a2334363ca1492ca298ea526d/wit/types.wit#L572
+    class OutgoingResponse
+      attr_reader :status_code, :headers, :body
+
+      def initialize(headers:, status_code: 200)
+        @headers = headers
+        @status_code = status_code
+        @body = nil
+      end
+
+      def write(response_body)
+        @body = response_body
+      end
+    end
+
+    # wasi:http/proxy-like handler implementation for Rack apps
+    class IncomingHandler
+      private attr_reader :base_url
+
+      def initialize(app, base_url: "http://localhost:3000", skip_data_uri_uploads: false)
+        @app = app
+
+        @app = Rack::DataUriUploads.new(@app) unless skip_data_uri_uploads
+
+        @base_url = base_url
+      end
+
+      # Takes Wasi request, converts it to Rack request,
+      # calls the Rack app, and write Rack response back to the Wasi response.
+      #
+      # @param [Rack::WASI::HTTP::IncomingRequest] req
+      # @param [Rack::WASI::HTTP::ResponseOutparam] res
+      def handle(req, res)
+        uri = URI.join(base_url, req.path_with_query || "")
+        headers = req.headers.each.with_object({}) do |(key, value), headers|
+          headers["HTTP_#{key.upcase.gsub("-", "_")}"] = value
+          headers
+        end
+        http_method = req.method.upcase
+        headers[:method] = http_method
+
+        body = req.consume
+        headers[:input] = StringIO.new(body) if body
+
+        request = Rack::MockRequest.env_for(uri.to_s, headers)
+        begin
+          response = Rack::Response[*@app.call(request)]
+          response_status, response_headers, bodyiter = *response.finish
+
+          out_response = OutgoingResponse.new(headers: response_headers, status_code: response_status)
+
+          body = ""
+          body_is_set = false
+
+          bodyiter.each do |part|
+            body += part
+            body_is_set = true
+          end
+
+          # Serve images as base64 from Ruby and decode back in JS
+          # FIXME: extract into a separate middleware and add a header to indicate the transformation
+          if headers["Content-Type"]&.start_with?("image/")
+            body = Base64.strict_encode64(body)
+          end
+
+          out_response.write(body) if body_is_set
+          res.set(Result.new(out_response, nil))
+        rescue Exception => e
+          res.set(Result.new(e.message, 503))
+        end
+      end
+    end
+  end
+end

data/lib/wasmify/rails/builder.rb

@@ -5,6 +5,16 @@ require "wasmify-rails"
 require "ruby_wasm"
 require "ruby_wasm/cli"
 
+# Patch ruby.wasm CLI to use the latest patch versions of Ruby
+RubyWasm::CLI.singleton_class.prepend(Module.new do
+  def build_source_aliases(root)
+    super.tap do |sources|
+      sources["3.3"][:url] = "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.8.tar.gz"
+      sources["3.4"][:url] = "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.3.tar.gz"
+    end
+  end
+end)
+
 module Wasmify
   module Rails
     # A wrapper for rbwasm build command

data/lib/wasmify/rails/configuration.rb

@@ -4,12 +4,6 @@ require "yaml"
 
 module Wasmify
   module Rails
-    RUBY_VERSION_TO_WASM_RUBY_VERSION = {
-      "3.4" => "3.4.1",
-      "3.3" => "3.3.3",
-      "3.2" => "3.2.4"
-    }
-
     class Configuration
       attr_reader :pack_directories, :pack_root, :additional_root_files,
                   :exclude_gems, :ignore_gem_extensions,

data/lib/wasmify/rails/shim.rb

@@ -19,6 +19,14 @@ require "bundler"
 # Load core classes and deps patches
 $LOAD_PATH.unshift File.expand_path("shims", __dir__)
 
+# Prevent features:
+#   - `bundler/setup` — we do that manually via `/bundle/setup`#
+%w[
+  bundler/setup
+].each do |feature|
+  $LOAD_PATH.resolve_feature_path(feature)&.then { $LOADED_FEATURES << _1[1] }
+end
+
 # Misc patches
 
 # Make gem no-op

data/lib/wasmify/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Wasmify
   module Rails # :nodoc:
-    VERSION = "0.3.0"
+    VERSION = "0.3.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wasmify-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-06 00:00:00.000000000 Z
+date: 2025-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -153,6 +153,7 @@ files:
 - lib/generators/wasmify/pwa/templates/pwa/vite.config.js
 - lib/image_processing/null.rb
 - lib/rack/data_uri_uploads.rb
+- lib/rack/wasi/incoming_handler.rb
 - lib/wasmify-rails.rb
 - lib/wasmify/rails/builder.rb
 - lib/wasmify/rails/configuration.rb