ruflet_server 0.0.20 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8ce7c65f8922fb96c632f08c3fbbfbe5ab4d2f51ef010aca2938dada94bbb06
-  data.tar.gz: '09a16364d80b69210248753a9eeb062a8d895be2cfa02844bd7850a96c4392d4'
+  metadata.gz: cd0a28621f5068581ced0ccb30b88d298b3e3fbcccb9747d89835cc301f00117
+  data.tar.gz: '028d69d0d2186e6cbbe2e30fab7b87a9403ed73d0261e4129f14a4458ebf1018'
 SHA512:
-  metadata.gz: 0efb74cd09d74eb058e0cfbdaa3027483fb809552e15109070a80e3bad364f9d9d297173249033df16029c2f6c366ee24db3e40848d1adf7fa583927b4fe7a83
-  data.tar.gz: 908da326003ca5cfff54b1a608148afaf0f557c8d9871c602e8234abe6710b6e79c27f0f0de0b9bcda78368ec67735d62ba31b41f84af9f6b551791bde15a889
+  metadata.gz: afed8a7dfd432ca20e3303766599a5e960ec44a8037d9345c9fdd8c03d7f70dd74e801809f42e39958c9330e6ac3c83b95bbd252992017bac78c8984ee5e13e1
+  data.tar.gz: 73e7bbcd814572b1b395042ca164dd219a2d273b0998f73c2e43f54c901a4acfc372c25895ad312280a370604782b652b6e3d508d67f22d472cf5a421bd094d4

data/lib/ruflet/server/connection_protocol.rb

@@ -96,6 +96,11 @@ module Ruflet
         on_update_control(ws, payload)
       when Protocol::ACTIONS[:invoke_control_method]
         on_invoke_control_method(ws, payload)
+      when Protocol::ACTIONS[:python_output]
+        # Flet clients can emit this legacy diagnostic action. It carries no
+        # server-side state, but it is a valid wire message and must not be
+        # treated as a protocol error or tear down host-adapter connections.
+        nil
       else
         raise "Unknown action: #{action.inspect}"
       end
@@ -149,7 +154,7 @@ module Ruflet
 
       if page
         attach_sender(page, ws)
-        reset_mount_state(page)
+        page.prepare_for_reconnect!
       else
         page = Page.new(
           session_id: session_id,
@@ -251,12 +256,6 @@ module Ruflet
       page.instance_variable_set(:@sender, sender_for(ws))
     end
 
-    def reset_mount_state(page)
-      page.instance_variable_set(:@overlay_container_mounted, false)
-      page.instance_variable_set(:@dialogs_container_mounted, false)
-      page.instance_variable_set(:@services_container_mounted, false)
-    end
-
     def disconnect_error?(error)
       return true if error.is_a?(IOError)
       return true if error.is_a?(Errno::EPIPE)

data/lib/ruflet/server/in_process_connection.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+module Ruflet
+  # Presents the embedded runtime bridge through the same connection contract
+  # used by the WebSocket transport. The server protocol therefore remains
+  # transport-agnostic: only the bytes' path changes.
+  class InProcessConnection
+    MAX_MESSAGE_BYTES = 16 * 1024 * 1024
+    TASK_PUMP_INTERVAL = 0.001
+    REQUIRED_BRIDGE_METHODS = %i[
+      __bridge_read_nonblock __bridge_write __bridge_close
+    ].freeze
+
+    def initialize(bridge: nil)
+      @bridge = bridge || default_bridge
+      @closed = false
+      validate_bridge!
+    end
+
+    def session_key
+      @session_key ||= object_id
+    end
+
+    def closed?
+      @closed
+    end
+
+    def read_message
+      return nil if closed?
+
+      payload = wait_for_message
+      if payload.nil?
+        @closed = true
+        return nil
+      end
+
+      checked_bytes(payload)
+    end
+
+    def send_binary(payload)
+      raise IOError, "Ruflet in-process connection is closed" if closed?
+
+      @bridge.__bridge_write(checked_bytes(payload))
+    end
+
+    def send_text(payload)
+      send_binary(payload)
+    end
+
+    def close
+      return if closed?
+
+      @closed = true
+      @bridge.__bridge_close
+    end
+
+    private
+
+    def default_bridge
+      Object.const_get(:RubyRuntime)
+    rescue NameError
+      raise RuntimeError, "Ruflet in-process transport requires the embedded RubyRuntime bridge"
+    end
+
+    def validate_bridge!
+      missing = REQUIRED_BRIDGE_METHODS.reject { |method_name| @bridge.respond_to?(method_name) }
+      return if missing.empty?
+
+      raise RuntimeError, "Ruflet in-process bridge is missing: #{missing.join(', ')}"
+    end
+
+    def wait_for_message
+      loop do
+        payload = @bridge.__bridge_read_nonblock
+        return payload unless payload == false
+
+        Thread.pass if Thread.respond_to?(:cooperative?) && Thread.cooperative?
+        sleep TASK_PUMP_INTERVAL
+      end
+    end
+
+    def checked_bytes(payload)
+      bytes = payload.to_s.b
+      if bytes.bytesize > MAX_MESSAGE_BYTES
+        raise ArgumentError, "Ruflet in-process message exceeds #{MAX_MESSAGE_BYTES} bytes"
+      end
+
+      bytes
+    end
+  end
+end

data/lib/ruflet/server/web_socket_connection.rb

@@ -22,7 +22,9 @@ module Ruflet
     end
 
     def send_binary(payload)
-      send_frame(0x2, payload.to_s.b)
+      bytes = payload.to_s.b
+      Ruflet::WireCodec.trace("ruby->client conn=#{session_key}", bytes)
+      send_frame(0x2, bytes)
     end
 
     def send_text(payload)
@@ -46,7 +48,7 @@ module Ruflet
       when 0xA
         read_message
       when 0x1, 0x2
-        return payload if frame[:fin]
+        return traced_incoming(payload) if frame[:fin]
 
         message = payload.dup
         loop do
@@ -61,7 +63,7 @@ module Ruflet
             next
           when 0x0
             message << continuation[:payload]
-            return message if continuation[:fin]
+            return traced_incoming(message) if continuation[:fin]
             return nil if message.bytesize > MAX_FRAME_PAYLOAD_BYTES
           else
             return nil
@@ -84,6 +86,11 @@ module Ruflet
 
     private
 
+    def traced_incoming(payload)
+      Ruflet::WireCodec.trace("client->ruby conn=#{session_key}", payload)
+      payload
+    end
+
     def read_frame
       header = read_exact(2)
       return nil if header.nil?

data/lib/ruflet/server/wire_codec.rb

@@ -3,6 +3,30 @@
 module Ruflet
   class WireCodec
     class << self
+      # Transport tracing is opt-in. Even compact summaries decode every frame
+      # and write to stdout, so enabling them by default would distort the
+      # renderer performance they are intended to diagnose.
+      #
+      #   RUFLET_PROTOCOL_TRACE=summary  compact frame metadata
+      #   RUFLET_PROTOCOL_TRACE=1        exact bytes and decoded value
+      #   RUFLET_PROTOCOL_TRACE=0        disabled (default)
+      def trace(direction, bytes)
+        mode = ENV.fetch("RUFLET_PROTOCOL_TRACE", "0")
+        return if mode == "0"
+
+        raw = bytes.to_s.b
+        decoded = unpack(raw)
+        action = decoded.is_a?(Array) ? decoded[0] : nil
+        prefix = "[RUFLET_PROTOCOL] t=#{format("%.6f", Process.clock_gettime(Process::CLOCK_MONOTONIC))} #{direction} bytes=#{raw.bytesize} action=#{action.inspect}"
+        if mode == "1" || mode == "full"
+          puts "#{prefix} hex=#{raw.unpack("H*").first} data=#{decoded.inspect}"
+        else
+          puts "#{prefix} #{trace_summary(action, decoded.is_a?(Array) ? decoded[1] : nil)}".rstrip
+        end
+      rescue StandardError => error
+        puts "[RUFLET_PROTOCOL] t=#{format("%.6f", Process.clock_gettime(Process::CLOCK_MONOTONIC))} #{direction} bytes=#{raw&.bytesize || 0} decode_error=#{error.class}: #{error.message}"
+      end
+
       def pack(value)
         case value
         when Ruflet::Protocol::DateTimeValue
@@ -41,6 +65,27 @@ module Ruflet
 
       private
 
+      def trace_summary(action, payload)
+        return "payload=#{payload.class}" unless payload.is_a?(Hash)
+
+        case action
+        when 1
+          "session_id=#{payload["session_id"].inspect} page_name=#{payload["page_name"].inspect}"
+        when 2
+          patch = payload["patch"]
+          "target=#{payload["id"].inspect} patch_items=#{patch.is_a?(Array) ? patch.length : 0}"
+        when 3
+          "target=#{payload["target"].inspect} name=#{payload["name"].inspect} data_type=#{payload["data"].class}"
+        when 4
+          properties = payload["props"]
+          "target=#{payload["id"].inspect} properties=#{properties.is_a?(Hash) ? properties.keys.sort.join(",") : ""}"
+        when 5
+          "target=#{payload["control_id"].inspect} name=#{payload["name"].inspect}"
+        else
+          "keys=#{payload.keys.map(&:to_s).sort.join(",")}"
+        end
+      end
+
       def pack_extension(type, value)
         bytes = value.to_s.b
         length = bytes.bytesize

data/lib/ruflet/server.rb

@@ -5,6 +5,7 @@ require "socket"
 require "thread"
 
 require "ruflet_core"
+require_relative "server/in_process_connection"
 require_relative "server/wire_codec"
 require_relative "server/web_socket_connection"
 
@@ -15,9 +16,10 @@ module Ruflet
     WEBSOCKET_GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
     TASK_IO_POLL_INTERVAL = 0.01
 
-    def initialize(host: "0.0.0.0", port: 8550, &app_block)
+    def initialize(host: "0.0.0.0", port: 8550, in_process_bridge: nil, &app_block)
       @host = host
       @port = port
+      @in_process_bridge = in_process_bridge
       @app_block = app_block
       @sessions = {}
       @sessions_mutex = Mutex.new
@@ -44,10 +46,14 @@ module Ruflet
       end
 
       previous_signals = trap_stop_signals
-      bind_server_socket!
-      @running = true
-      print_server_banner
-      accept_loop
+      if in_process_transport_requested?
+        start_in_process_transport
+      else
+        bind_server_socket!
+        @running = true
+        print_server_banner
+        accept_loop
+      end
     rescue Interrupt
       nil
     ensure
@@ -175,6 +181,16 @@ module Ruflet
 
     private
 
+    def in_process_transport_requested?
+      ENV["RUFLET_RUNTIME_TRANSPORT"] == "in_process"
+    end
+
+    def start_in_process_transport
+      connection = Ruflet::InProcessConnection.new(bridge: @in_process_bridge)
+      @running = true
+      run_connection(connection)
+    end
+
     def trap_stop_signals
       {
         "INT" => trap_signal("INT"),
@@ -380,7 +396,12 @@ module Ruflet
     # opens its websocket on one origin. Without that the client cannot reach
     # /ws at all.
     def web_client_root
-      return @web_client_root if defined?(@web_client_root)
+      # Memoized with a separate flag rather than defined?(@web_client_root):
+      # the embedded mruby VM has no defined? keyword, so it parses as a method
+      # call and every request raises NoMethodError. The resolved value is
+      # legitimately nil when no web client is configured, so nil cannot double
+      # as "not resolved yet".
+      return @web_client_root if @web_client_root_resolved
 
       configured = ENV["RUFLET_WEB_CLIENT_DIR"].to_s.strip
       @web_client_root =
@@ -389,6 +410,8 @@ module Ruflet
         else
           File.expand_path(configured)
         end
+      @web_client_root_resolved = true
+      @web_client_root
     end
 
     def serve_web_client(socket, request_path)

data/lib/ruflet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ruflet
-  VERSION = "0.0.20" unless const_defined?(:VERSION)
+  VERSION = "0.0.22" unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruflet_server
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.22
 platform: ruby
 authors:
 - AdamMusa
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.20
+        version: 0.0.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.20
+        version: 0.0.22
 description: Ruflet WebSocket server runtime compatible with Flet protocol.
 email:
 - adammusa2222@gmail.com
@@ -33,6 +33,7 @@ files:
 - README.md
 - lib/ruflet/server.rb
 - lib/ruflet/server/connection_protocol.rb
+- lib/ruflet/server/in_process_connection.rb
 - lib/ruflet/server/web_socket_connection.rb
 - lib/ruflet/server/wire_codec.rb
 - lib/ruflet/version.rb