javonet-ruby-sdk 2.5.13 → 2.5.15

data/lib/javonet-ruby-sdk/Binaries/Ruby/Windows/X64/core/type_cache/type_cache.rb

@@ -1,10 +1,12 @@
-require_relative './../../external_lib/singleton'
-
 class TypeCache
-  include Singleton
-
   attr_accessor :type_cache
 
+  def self.instance
+    @instance ||= new
+  end
+
+  private_class_method :new
+
   def initialize
     @type_cache = []
   end
@@ -18,14 +20,14 @@ class TypeCache
   end
 
   def is_type_allowed(type_to_check)
-    if type_to_check.is_a?(Module)
-      name_to_check = type_to_check.name
-    else
-      name_to_check = "#{type_to_check.class.name}::#{type_to_check.name}"
-    end
-
-    @type_cache.any? do
-|pattern| /#{pattern}/.match?(name_to_check)
+    name_to_check = if type_to_check.is_a?(Module)
+                      type_to_check.name
+                    else
+                      "#{type_to_check.class.name}::#{type_to_check.name}"
+                    end
+
+    @type_cache.any? do |pattern|
+      /#{pattern}/.match?(name_to_check)
     end
   end
 

data/lib/javonet-ruby-sdk/Binaries/Ruby/Windows/X64/utils/runtime_name.rb

@@ -8,4 +8,6 @@ module RuntimeName
   RUBY = 6
   NODEJS = 7
   CPP = 8
+  PHP = 9
+  PYTHON27 = 10
 end

data/lib/javonet-ruby-sdk/Binaries/Ruby/Windows/X64/utils/runtime_name_handler.rb

@@ -30,5 +30,11 @@ class RuntimeNameHandler
     if runtime_name == RuntimeName::CPP
       return 'cpp'
     end
+    if runtime_name == RuntimeName::PHP
+      return 'php'
+    end
+    if runtime_name == RuntimeName::PYTHON27
+      return 'python27'
+    end
   end
 end

data/lib/javonet-ruby-sdk/Binaries/version.txt

@@ -1 +1 @@
-2.5.13
+2.5.15

data/lib/javonet-ruby-sdk/core/handler/get_type_handler.rb

@@ -21,15 +21,16 @@ class GetTypeHandler < AbstractCommandHandler
         raise "Type #{command.payload[0]} not found.\n"
       end
 
-      if (@namespace_cache.is_namespace_cache_empty? && @type_cache.is_type_cache_empty?) || # both caches are empty
-        @namespace_cache.is_type_allowed(type_to_return) || # namespace is allowed
-        @type_cache.is_type_allowed(type_to_return)
-        # continue - type is allowed
-      else
-        allowed_namespaces = @namespace_cache.get_cached_namespaces.join(", ")
-        allowed_types = @type_cache.get_cached_types.join(", ")
-        raise "Type #{type_to_return.name} not allowed. \nAllowed namespaces: #{allowed_namespaces}\nAllowed types: #{allowed_types}"
-      end
+      # there is a issue with @namespace_cache.empty? and @type_cache.empty? while using ruby through javonet. it has to be turned off
+      # if (@namespace_cache.is_namespace_cache_empty? && @type_cache.is_type_cache_empty?) || # both caches are empty
+      #   @namespace_cache.is_type_allowed(type_to_return) || # namespace is allowed
+      #   @type_cache.is_type_allowed(type_to_return)
+      #   # continue - type is allowed
+      # else
+      #   allowed_namespaces = @namespace_cache.get_cached_namespaces.join(", ")
+      #   allowed_types = @type_cache.get_cached_types.join(", ")
+      #   raise "Type #{type_to_return.name} not allowed. \nAllowed namespaces: #{allowed_namespaces}\nAllowed types: #{allowed_types}"
+      # end
 
       type_to_return
     rescue Exception => e

data/lib/javonet-ruby-sdk/core/namespace_cache/namespace_cache.rb

@@ -1,10 +1,12 @@
-require_relative './../../external_lib/singleton'
-
 class NamespaceCache
-  include Singleton
-
   attr_accessor :namespace_cache
 
+  def self.instance
+    @instance ||= new
+  end
+
+  private_class_method :new
+
   def initialize
     @namespace_cache = []
   end
@@ -18,23 +20,23 @@ class NamespaceCache
   end
 
   def is_type_allowed(type_to_check)
-    if type_to_check.is_a?(Module)
-      name_to_check = type_to_check.name
-    else
-      name_to_check = "#{type_to_check.class.name}"
-    end
+    name_to_check = if type_to_check.is_a?(Module)
+                      type_to_check.name
+                    else
+                      "#{type_to_check.class.name}"
+                    end
 
     @namespace_cache.any? do |pattern|
       /#{pattern}/.match?(name_to_check)
     end
   end
 
-def get_cached_namespaces
-  @namespace_cache
-end
+  def get_cached_namespaces
+    @namespace_cache
+  end
 
-def clear_cache
-  @namespace_cache.clear
-  0
+  def clear_cache
+    @namespace_cache.clear
+    0
+  end
 end
-end

data/lib/javonet-ruby-sdk/core/protocol/command_deserializer.rb

@@ -2,18 +2,19 @@ require_relative 'type_deserializer'
 require_relative '../../utils/type'
 require_relative '../../utils/command'
 require_relative '../../utils/string_encoding_mode'
+require_relative '../../utils/command_type'
+require_relative '../../utils/runtime_name'
 
 class CommandDeserializer
-
   def initialize(buffer)
     @buffer = buffer
-    @byte_array_len = buffer.length
+    @buffer_len = buffer.length
     @command = Command.new(buffer[0], buffer[10], [])
     @position = 11
   end
 
   def is_at_end
-    @position == @byte_array_len
+    @position == @buffer_len
   end
 
   def deserialize
@@ -23,11 +24,6 @@ class CommandDeserializer
     @command
   end
 
-  # def copy_from(self, bytes_to_copy, elements_to_skip):
-  #     size = len(bytes_to_copy) - elements_to_skip
-  #     new_byte_array = bytes_to_copy[size]
-  #     return new_byte_array
-
   def read_object(type_num)
     case type_num
     when Type::COMMAND
@@ -65,19 +61,34 @@ class CommandDeserializer
     runtime = @buffer[p + 5]
     command_type = @buffer[p + 6]
     @position += 7
-    return_command = Command.new(runtime, command_type, [])
-    read_command_recursively(number_of_elements_in_payload, return_command)
-  end
 
-  def read_command_recursively(number_of_elements_in_payload_left, cmd)
-    if number_of_elements_in_payload_left == 0
-      cmd
-    else
-      p = @position
-      cmd = cmd.add_arg_to_payload(self.read_object(@buffer[p]))
-      read_command_recursively(number_of_elements_in_payload_left - 1, cmd)
+    payload = Array.new(number_of_elements_in_payload)
+    for i in 0..number_of_elements_in_payload - 1
+      payload[i] = read_object(@buffer[@position])
     end
-  end
+    Command.new(runtime, command_type, payload)
+  end
+
+  # old implementation
+  #  def read_command
+  #    p = @position
+  #    number_of_elements_in_payload = TypeDeserializer.deserialize_int(@buffer[p + 1..p + 4])
+  #    runtime = @buffer[p + 5]
+  #    command_type = @buffer[p + 6]
+  #    @position += 7
+  #    return_command = Command.new(runtime, command_type, [])
+  #    read_command_recursively(number_of_elements_in_payload, return_command)
+  #  end
+  #
+  #  def read_command_recursively(number_of_elements_in_payload_left, cmd)
+  #    if number_of_elements_in_payload_left == 0
+  #      cmd
+  #    else
+  #      p = @position
+  #      cmd = cmd.add_arg_to_payload(self.read_object(@buffer[p]))
+  #      read_command_recursively(number_of_elements_in_payload_left - 1, cmd)
+  #    end
+  #  end
 
   def read_string
     p = @position
@@ -86,7 +97,7 @@ class CommandDeserializer
     @position += 6
     p = @position
     @position += size
-    TypeDeserializer.deserialize_string(string_encoding_mode, @buffer[p..p + size - 1])
+    TypeDeserializer.deserialize_string(string_encoding_mode, @buffer[p...p + size])
   end
 
   def read_int
@@ -94,7 +105,7 @@ class CommandDeserializer
     @position += 2
     p = @position
     @position += size
-    TypeDeserializer.deserialize_int(@buffer[p..p + size - 1])
+    TypeDeserializer.deserialize_int(@buffer[p...p + size])
   end
 
   def read_bool
@@ -102,7 +113,7 @@ class CommandDeserializer
     @position += 2
     p = @position
     @position += size
-    TypeDeserializer.deserialize_bool(@buffer[p..p + size])
+    TypeDeserializer.deserialize_bool(@buffer[p...p + size])
   end
 
   def read_float
@@ -110,7 +121,7 @@ class CommandDeserializer
     @position += 2
     p = @position
     @position += size
-    TypeDeserializer.deserialize_float(@buffer[p..p + size - 1])
+    TypeDeserializer.deserialize_float(@buffer[p...p + size])
   end
 
   def read_byte
@@ -118,7 +129,7 @@ class CommandDeserializer
     @position += 2
     p = @position
     @position += size
-    TypeDeserializer.deserialize_byte(@buffer[p..p + size])
+    TypeDeserializer.deserialize_byte(@buffer[p...p + size])
   end
 
   def read_char
@@ -126,7 +137,7 @@ class CommandDeserializer
     @position += 2
     p = @position
     @position += size
-    TypeDeserializer.deserialize_char(@buffer[p..p + size])
+    TypeDeserializer.deserialize_char(@buffer[p...p + size])
   end
 
   def read_longlong
@@ -134,7 +145,7 @@ class CommandDeserializer
     @position += 2
     p = @position
     @position += size
-    TypeDeserializer.deserialize_longlong(@buffer[p..p + size - 1])
+    TypeDeserializer.deserialize_longlong(@buffer[p...p + size])
   end
 
   def read_double
@@ -142,7 +153,7 @@ class CommandDeserializer
     @position += 2
     p = @position
     @position += size
-    TypeDeserializer.deserialize_double(@buffer[p..p + size - 1])
+    TypeDeserializer.deserialize_double(@buffer[p...p + size])
   end
 
   def read_ullong
@@ -150,7 +161,7 @@ class CommandDeserializer
     @position += 2
     p = @position
     @position += size
-    TypeDeserializer.deserialize_ullong(@buffer[p..p + size - 1])
+    TypeDeserializer.deserialize_ullong(@buffer[p...p + size])
   end
 
   def read_uint
@@ -158,7 +169,7 @@ class CommandDeserializer
     @position += 2
     p = @position
     @position += size
-    TypeDeserializer.deserialize_uint(@buffer[p..p + size - 1])
+    TypeDeserializer.deserialize_uint(@buffer[p...p + size])
   end
 
   def read_nil
@@ -166,6 +177,6 @@ class CommandDeserializer
     @position += 2
     p = @position
     @position += size
-    TypeDeserializer.deserialize_nil(@buffer[p..p + size])
+    TypeDeserializer.deserialize_nil(@buffer[p...p + size])
   end
 end

data/lib/javonet-ruby-sdk/core/protocol/command_serializer.rb

@@ -4,34 +4,32 @@ require_relative '../../utils/runtime_name'
 require_relative '../../utils/tcp_connection_data'
 
 class CommandSerializer
-  def initialize
-    @buffer = []
-  end
-
   def serialize(root_command, connection_data = nil, runtime_version = 0)
-    insert_into_buffer([root_command.runtime_name, runtime_version])
-    if connection_data.nil?
-      insert_into_buffer([0, 0, 0, 0, 0, 0, 0])
+    buffer = []
+    buffer << root_command.runtime_name
+    buffer << runtime_version
+
+    if connection_data
+      buffer.concat(connection_data.serialize_connection_data)
     else
-      insert_into_buffer(connection_data.serialize_connection_data)
+      buffer.concat([0, 0, 0, 0, 0, 0, 0])
     end
-    insert_into_buffer([RuntimeName::PYTHON, root_command.command_type])
-    serialize_recursively(root_command)
-    @buffer
+
+    buffer << RuntimeName::RUBY
+    buffer << root_command.command_type
+
+    serialize_recursively(root_command, buffer)
+    buffer
   end
 
-  def serialize_recursively(command)
+  def serialize_recursively(command, buffer)
     command.payload.each do |item|
       if item.is_a?(Command)
-        insert_into_buffer(TypeSerializer.serialize_command(item))
-        serialize_recursively(item)
+        buffer.concat(TypeSerializer.serialize_command(item))
+        serialize_recursively(item, buffer)
       else
-        insert_into_buffer(TypeSerializer.serialize_primitive(item))
+        buffer.concat(TypeSerializer.serialize_primitive(item))
       end
     end
   end
-
-  def insert_into_buffer(arguments)
-    @buffer += arguments
-  end
 end

data/lib/javonet-ruby-sdk/core/protocol/type_deserializer.rb

@@ -7,23 +7,30 @@ class TypeDeserializer
   end
 
   def self.deserialize_string(string_encoding_mode, encoded_string)
+    raw_str = encoded_string.map(&:chr).join
     case string_encoding_mode
     when StringEncodingMode::ASCII
-      encoded_string.pack('C*').force_encoding("US-ASCII").encode("UTF-8")
+      raw_str.force_encoding("US-ASCII").encode("UTF-8")
     when StringEncodingMode::UTF8
-      encoded_string.pack("C*").force_encoding("UTF-8").encode("UTF-8")
+      raw_str.force_encoding("UTF-8").encode("UTF-8")
     when StringEncodingMode::UTF16
-      encoded_string.pack("C*").force_encoding("UTF-16LE").encode("UTF-8")
+      raw_str.force_encoding("UTF-16LE").encode("UTF-8")
     when StringEncodingMode::UTF32
-      encoded_string.pack("C*").force_encoding("UTF-32").encode("UTF-8")
+      raw_str.force_encoding("UTF-32").encode("UTF-8")
     else
       raise "Argument out of range in deserialize_string"
     end
-
   end
 
   def self.deserialize_int(encoded_int)
-    encoded_int.map(&:chr).join.unpack('i').first
+    # Assuming a 32-bit little-endian integer.
+    value = 0
+    encoded_int.each_with_index do |byte, index|
+      value |= (byte & 0xFF) << (8 * index)
+    end
+    # Sign extension if the 31st bit is set.
+    value -= (1 << 32) if (value & (1 << 31)) != 0
+    value
   end
 
   def self.deserialize_bool(encoded_bool)
@@ -31,7 +38,27 @@ class TypeDeserializer
   end
 
   def self.deserialize_float(encoded_float)
-    encoded_float.map(&:chr).join.unpack('f').first
+    # Reconstruct the 32-bit integer from the byte array.
+    bits = 0
+    encoded_float.each_with_index do |byte, index|
+      bits |= (byte & 0xFF) << (8 * index)
+    end
+
+    # IEEE 754 single precision (32-bit) decoding:
+    sign     = ((bits >> 31) == 0) ? 1 : -1
+    exponent = (bits >> 23) & 0xFF
+    fraction = bits & 0x7FFFFF
+
+    if exponent == 255
+      # Handle special cases for Inf and NaN.
+      return fraction == 0 ? sign * Float::INFINITY : Float::NAN
+    elsif exponent == 0
+      # Subnormal numbers.
+      return sign * (fraction.to_f / (1 << 23)) * (2 ** (-126))
+    else
+      # Normalized number.
+      return sign * (1 + fraction.to_f / (1 << 23)) * (2 ** (exponent - 127))
+    end
   end
 
   def self.deserialize_byte(encoded_byte)
@@ -43,19 +70,53 @@ class TypeDeserializer
   end
 
   def self.deserialize_longlong(encoded_long)
-    encoded_long.map(&:chr).join.unpack('q').first
+    # Assuming a 64-bit little-endian integer.
+    value = 0
+    encoded_long.each_with_index do |byte, index|
+      value |= (byte & 0xFF) << (8 * index)
+    end
+    # Sign extension for 64-bit: if the 63rd bit is set.
+    value -= (1 << 64) if value >= (1 << 63)
+    value
   end
 
   def self.deserialize_double(encoded_double)
-    encoded_double.map(&:chr).join.unpack('d').first
+    # Reconstruct the 64-bit bit pattern from the byte array.
+    bits = 0
+    encoded_double.each_with_index do |byte, index|
+      bits |= (byte & 0xFF) << (8 * index)
+    end
+
+    # IEEE 754 double precision (64-bit) decoding:
+    sign     = ((bits >> 63) == 0) ? 1 : -1
+    exponent = (bits >> 52) & 0x7FF
+    fraction = bits & 0xFFFFFFFFFFFFF
+
+    if exponent == 2047
+      return fraction == 0 ? sign * Float::INFINITY : Float::NAN
+    elsif exponent == 0
+      return sign * (fraction.to_f / (1 << 52)) * (2 ** (-1022))
+    else
+      return sign * (1 + fraction.to_f / (1 << 52)) * (2 ** (exponent - 1023))
+    end
   end
 
   def self.deserialize_ullong(encoded_ullong)
-    encoded_ullong.map(&:chr).join.unpack('Q').first
+    # Assuming an unsigned 64-bit little-endian integer.
+    value = 0
+    encoded_ullong.each_with_index do |byte, index|
+      value |= (byte & 0xFF) << (8 * index)
+    end
+    value
   end
 
   def self.deserialize_uint(encoded_uint)
-    encoded_uint.map(&:chr).join.unpack('I').first
+    # Assuming an unsigned 32-bit little-endian integer.
+    value = 0
+    encoded_uint.each_with_index do |byte, index|
+      value |= (byte & 0xFF) << (8 * index)
+    end
+    value
   end
 
   def self.deserialize_nil(encoded_nil)