ruflet_server 0.0.12 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f7f6af6a5f50b057d32c477999140b9fad6bd8e60c94b552daebee6baf69acc
-  data.tar.gz: 7520f899e68da6be32c2a4534ab2abb61514820f2ed9c4df457322c16a5940c4
+  metadata.gz: 68ae173b9c0aa89989e40d996aed245db4c434b96e084b2bc83642c89f244208
+  data.tar.gz: 9aea810e84df29511565821252e06f7c0a73cc989b5df86df683393a496d8793
 SHA512:
-  metadata.gz: c6d38619ee9efd5b35bc1c41b55b47740027e59bb9b95d3884c1d38f74079d7bcbb996e33d6240b05b2a3325cc971186bb458e89d47752fdd507358e78921d75
-  data.tar.gz: 1e40e525abb2f0b87a4bd30d4ff63134e932bc659f59f839cd2200fde74cfbb8a243bcb3d8653fec62bb9624d4906b5991d0766724eb3efd622fab2b0d9d1228
+  metadata.gz: de44b6b80acfdc2ce0bca54a3460e027b053d16244cf8d1e44d81b6446d036795008cba9510d37ccec622734205b9bb41cecb8401456bbeb0fa349d8a51ad13e
+  data.tar.gz: 5a7e6e9e7623eebc5635ac8e200e13d8e62ba68335d5fe15533d6260b88a83fe5f5d3c279819c3f89d8f2465a5fac5014e399d1c4b9d67a52a15c0a3f3a76f91

data/lib/ruflet/server/wire_codec.rb

@@ -2,8 +2,13 @@
 
 module Ruflet
   class WireCodec
+    PICKER_DATE_CONTROLS = %w[CupertinoDatePicker DatePicker DateRangePicker].freeze
+    PICKER_DATE_KEYS = %w[current_date end_value first_date last_date start_value value].freeze
+    PICKER_TIME_CONTROLS = %w[TimePicker].freeze
+    PICKER_TIME_KEYS = %w[value].freeze
+
     class << self
-      def pack(value)
+      def pack(value, context = nil)
         case value
         when NilClass
           "\xc0".b
@@ -16,11 +21,14 @@ module Ruflet
         when Float
           "\xcb".b + [value].pack("G")
         when String
-          pack_string(value)
+          return pack_ext(1, normalize_date_ext(value)) if context == :date
+          return pack_ext(2, normalize_time_ext(value)) if context == :time
+
+          binary_string?(value) ? pack_binary(value) : pack_string(value)
         when Symbol
           pack_string(value.to_s)
         when Array
-          pack_array(value)
+          pack_array(value, context)
         when Hash
           pack_map(value)
         else
@@ -69,7 +77,58 @@ module Ruflet
         end
       end
 
-      def pack_array(value)
+      def pack_binary(value)
+        bytes = value.to_s.b
+        len = bytes.bytesize
+
+        if len <= 0xff
+          "\xc4".b + [len].pack("C") + bytes
+        elsif len <= 0xffff
+          "\xc5".b + [len].pack("n") + bytes
+        else
+          "\xc6".b + [len].pack("N") + bytes
+        end
+      end
+
+      def binary_string?(value)
+        value.encoding == Encoding::BINARY || !value.valid_encoding?
+      end
+
+      def pack_ext(type, payload)
+        bytes = payload.to_s.b
+        len = bytes.bytesize
+
+        if len == 1
+          "\xd4".b + [type].pack("c") + bytes
+        elsif len == 2
+          "\xd5".b + [type].pack("c") + bytes
+        elsif len == 4
+          "\xd6".b + [type].pack("c") + bytes
+        elsif len == 8
+          "\xd7".b + [type].pack("c") + bytes
+        elsif len == 16
+          "\xd8".b + [type].pack("c") + bytes
+        elsif len <= 0xff
+          "\xc7".b + [len, type].pack("Cc") + bytes
+        elsif len <= 0xffff
+          "\xc8".b + [len, type].pack("nc") + bytes
+        else
+          "\xc9".b + [len, type].pack("Nc") + bytes
+        end
+      end
+
+      def normalize_date_ext(value)
+        raw = value.to_s
+        return "#{raw}T00:00:00+00:00" if raw.match?(/\A\d{4}-\d{2}-\d{2}\z/)
+
+        raw
+      end
+
+      def normalize_time_ext(value)
+        value.to_s
+      end
+
+      def pack_array(value, context = nil)
         len = value.length
         head =
           if len <= 15
@@ -81,7 +140,7 @@ module Ruflet
           end
 
         body = +"".b
-        value.each { |item| body << pack(item) }
+        value.each { |item| body << pack(item, context) }
         head + body
       end
 
@@ -98,13 +157,22 @@ module Ruflet
           end
 
         body = +"".b
+        control_type = pairs["_c"].to_s
         pairs.each do |k, v|
           body << pack(k)
-          body << pack(v)
+          body << pack(v, picker_prop_context(control_type, k))
         end
         head + body
       end
 
+      def picker_prop_context(control_type, key)
+        key = key.to_s
+        return :date if PICKER_DATE_CONTROLS.include?(control_type) && PICKER_DATE_KEYS.include?(key)
+        return :time if PICKER_TIME_CONTROLS.include?(control_type) && PICKER_TIME_KEYS.include?(key)
+
+        nil
+      end
+
       def read_value(reader)
         marker = reader.read_u8
 
@@ -178,8 +246,17 @@ module Ruflet
       end
 
       def read_ext(reader, size)
-        reader.read_i8 # type (ignored)
-        reader.read_exact(size)
+        type = reader.read_i8
+        data = reader.read_exact(size)
+
+        case type
+        when 1, 2, 4
+          data.dup.force_encoding("UTF-8")
+        when 3
+          data.to_i
+        else
+          data
+        end
       end
     end
 

data/lib/ruflet/server.rb

@@ -480,7 +480,7 @@ module Ruflet
 
     def on_invoke_control_method(ws, payload)
       page = fetch_page(ws)
-      page.handle_invoke_method_result(payload)
+      page.handle_invoke_method_result(Protocol.normalize_invoke_method_result_payload(payload))
     end
 
     def on_control_event(ws, payload)

data/lib/ruflet/version.rb

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

data/lib/ruflet_server.rb

@@ -10,8 +10,22 @@ module Ruflet
     callback = entrypoint || block
     raise ArgumentError, "Ruflet.run requires a callable entrypoint or block" unless callback.respond_to?(:call)
 
+    interceptor = run_interceptor
+    if interceptor
+      result = interceptor.call(entrypoint: callback, host: host, port: port)
+      return result unless result == :pass
+    end
+
     Server.new(host: host, port: port) do |page|
       callback.call(page)
     end.start
   end
+
+  def run_interceptor
+    return nil unless instance_variable_defined?(:@run_interceptors_mutex)
+    return nil unless instance_variable_defined?(:@run_interceptors)
+
+    @run_interceptors_mutex.synchronize { @run_interceptors.last }
+  end
+  private_class_method :run_interceptor
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruflet_server
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.14
 platform: ruby
 authors:
 - AdamMusa
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.0.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.0.14
 description: Ruflet WebSocket server runtime compatible with Flet protocol.
 email:
 - adammusa2222@gmail.com