ruflet_server 0.0.11 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ee025144d3d9fe1235f1e7f7c8a14de60580ad22b4894dbec77ca1d28849b82
-  data.tar.gz: de610c88bd47545155d9d2e2ddfea7c730897666cd1e45ea6d7834069e62b3d1
+  metadata.gz: 25450e49973d445cda961a273eda6c37aa2e1245865f4094e9c61a6df5dcfdbb
+  data.tar.gz: 607f67ac69a68360e657133f1f674f09ea917cdf53a2fe86bcf685e1022786ac
 SHA512:
-  metadata.gz: 613df335adacf2ab80ea8e0533a64273ab43a0b58e927d333e0cb664482c757f0b6d47d4543c03c57c038f258e183f7c7610b4792160d7656bc96c6d59426722
-  data.tar.gz: 0b07b670d0f2b15ccbdb07d2f76d6e384f41300fccc9614bf40865f5913b42b54faa34bab97b14843aa630f48ab3727323c4277e803c360860ea36f8a13fbe60
+  metadata.gz: f4f7c79eda7eeafe780e39e16a90f1196e8f729e802374885f2b283ca7e9f5759f7431747fccd8435ea8d60b8424d19d284c97550cfb1d1f96a952d76c467e63
+  data.tar.gz: d659f02495e1d47b9d9272327de7c42788287e0e269b245e2da511a4a7ae5124a7ac1bebf9566292c67567cc7af807beffd28fad84e3693f49dd0248f2ef316c

data/lib/ruflet/server/wire_codec.rb

@@ -16,7 +16,7 @@ module Ruflet
         when Float
           "\xcb".b + [value].pack("G")
         when String
-          pack_string(value)
+          binary_string?(value) ? pack_binary(value) : pack_string(value)
         when Symbol
           pack_string(value.to_s)
         when Array
@@ -69,6 +69,23 @@ module Ruflet
         end
       end
 
+      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_array(value)
         len = value.length
         head =
@@ -178,8 +195,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

@@ -56,8 +56,9 @@ module Ruflet
     def bind_server_socket!(max_attempts: 100)
       requested = @port.to_i
       candidate = requested
+      attempts = ENV["RUFLET_STRICT_PORT"] == "1" ? 1 : max_attempts
 
-      max_attempts.times do
+      attempts.times do
         begin
           @server_socket = TCPServer.new(@host, candidate)
           @port = candidate
@@ -70,6 +71,8 @@ module Ruflet
         end
       end
 
+      raise Errno::EADDRINUSE, "Unable to bind port #{requested}" if attempts == 1
+
       raise Errno::EADDRINUSE, "Unable to bind starting at #{requested} after #{max_attempts} attempts"
     end
 
@@ -477,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.11" unless const_defined?(:VERSION)
+  VERSION = "0.0.13" 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.11
+  version: 0.0.13
 platform: ruby
 authors:
 - AdamMusa
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.11
+        version: 0.0.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.11
+        version: 0.0.13
 description: Ruflet WebSocket server runtime compatible with Flet protocol.
 email:
 - adammusa2222@gmail.com