javonet-ruby-sdk 2.6.3 → 2.6.5

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

@@ -1,31 +1,31 @@
-require_relative 'abstract_command_handler'
-
-class SetStaticFieldHandler < AbstractCommandHandler
-  def initialize
-    @required_parameters_count = 3
-  end
-
-  def process(command)
-    Command.new(RuntimeNameJavonet::RUBY, CommandType::VALUE, [set_static_field(command)])
-  end
-
-  def set_static_field(command)
-    begin
-      if command.payload.length != @required_parameters_count
-        raise ArgumentError.new "Set static field parameters mismatch"
-      end
-
-      merged_value = '@@' + command.payload[1]
-      begin
-        command.payload[0].class_variable_set(merged_value, command.payload[2])
-      rescue Exception
-        fields = command.payload[0].class_variables
-        message = "Field #{command.payload[1]} not found in class #{command.payload[0].name}. Available fields:\n"
-        fields.each { |field_iter| message += "#{field_iter}\n" }
-        raise ArgumentError, message
-      end
-    rescue Exception => e
-      return e
-    end
-  end
-end
+require_relative 'abstract_command_handler'
+
+class SetStaticFieldHandler < AbstractCommandHandler
+  def initialize
+    @required_parameters_count = 3
+  end
+
+  def process(command)
+    Command.new(RuntimeNameJavonet::RUBY, CommandType::VALUE, [set_static_field(command)])
+  end
+
+  def set_static_field(command)
+    begin
+      if command.payload.length != @required_parameters_count
+        raise ArgumentError.new "Set static field parameters mismatch"
+      end
+
+      merged_value = '@@' + command.payload[1]
+      begin
+        command.payload[0].class_variable_set(merged_value, command.payload[2])
+      rescue Exception
+        fields = command.payload[0].class_variables
+        message = "Field #{command.payload[1]} not found in class #{command.payload[0].name}. Available fields:\n"
+        fields.each { |field_iter| message += "#{field_iter}\n" }
+        raise ArgumentError, message
+      end
+    rescue Exception => e
+      return e
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
-require_relative 'abstract_command_handler'
-
-class ValueHandler < AbstractCommandHandler
-  def process(command)
-    command.payload[0]
-  end
+require_relative 'abstract_command_handler'
+
+class ValueHandler < AbstractCommandHandler
+  def process(command)
+    command.payload[0]
+  end
 end

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

@@ -1,28 +1,28 @@
-require_relative '../protocol/command_serializer'
-require_relative '../protocol/command_deserializer'
-require_relative '../handler/handler'
-
-class Interpreter
-  @@handler = Handler.new
-
-  def execute(command, connection_type, connection_data)
-    message_byte_array = CommandSerializer.new.serialize(command, connection_data)
-    if command.runtime_name == RuntimeNameJavonet::RUBY && connection_type == ConnectionType::IN_MEMORY
-      require_relative '../receiver/receiver'
-      response_byte_array = Receiver.new.send_command(message_byte_array, message_byte_array.length)
-    elsif connection_type == ConnectionType::WEB_SOCKET
-      require_relative '../web_socket_client/web_socket_client'
-      response_byte_array = WebSocketClient.send_message(connection_data.hostname, message_byte_array)
-    else
-      require_relative '../transmitter/transmitter'
-      response_byte_array = Transmitter.send_command(message_byte_array, message_byte_array.length)
-    end
-
-    CommandDeserializer.new(response_byte_array).deserialize
-  end
-
-  def process(byte_array)
-    received_command = CommandDeserializer.new(byte_array).deserialize
-    @@handler.handle_command(received_command)
-  end
-end
+require_relative '../protocol/command_serializer'
+require_relative '../protocol/command_deserializer'
+require_relative '../handler/handler'
+
+class Interpreter
+  @@handler = Handler.new
+
+  def execute(command, connection_type, connection_data)
+    message_byte_array = CommandSerializer.new.serialize(command, connection_data)
+    if command.runtime_name == RuntimeNameJavonet::RUBY && connection_type == ConnectionType::IN_MEMORY
+      require_relative '../receiver/receiver_new'
+      response_byte_array = Receiver.new.send_command(message_byte_array, message_byte_array.length)[1]
+    elsif connection_type == ConnectionType::WEB_SOCKET
+      require_relative '../web_socket_client/web_socket_client'
+      response_byte_array = WebSocketClient.send_message(connection_data.hostname, message_byte_array)
+    else
+      require_relative '../transmitter/transmitter'
+      response_byte_array = Transmitter.send_command(message_byte_array, message_byte_array.length)
+    end
+
+    CommandDeserializer.new(response_byte_array).deserialize
+  end
+
+  def process(byte_array)
+    received_command = CommandDeserializer.new(byte_array).deserialize
+    @@handler.handle_command(received_command)
+  end
+end

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

@@ -1,42 +1,42 @@
-class NamespaceCache
-  attr_accessor :namespace_cache
-
-  def self.instance
-    @instance ||= new
-  end
-
-  private_class_method :new
-
-  def initialize
-    @namespace_cache = []
-  end
-
-  def cache_namespace(namespace_regex)
-    @namespace_cache << namespace_regex
-  end
-
-  def is_namespace_cache_empty?
-    @namespace_cache.empty?
-  end
-
-  def is_type_allowed(type_to_check)
-    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 clear_cache
-    @namespace_cache.clear
-    0
-  end
-end
+class NamespaceCache
+  attr_accessor :namespace_cache
+
+  def self.instance
+    @instance ||= new
+  end
+
+  private_class_method :new
+
+  def initialize
+    @namespace_cache = []
+  end
+
+  def cache_namespace(namespace_regex)
+    @namespace_cache << namespace_regex
+  end
+
+  def is_namespace_cache_empty?
+    @namespace_cache.empty?
+  end
+
+  def is_type_allowed(type_to_check)
+    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 clear_cache
+    @namespace_cache.clear
+    0
+  end
+end

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

@@ -1,182 +1,184 @@
-require_relative 'type_deserializer'
-require_relative '../../utils/type'
-require_relative '../../utils/command'
-require_relative '../../utils/string_encoding_mode_javonet'
-require_relative '../../utils/command_type'
-require_relative '../../utils/runtime_name_javonet'
-
-class CommandDeserializer
-  def initialize(buffer)
-    @buffer = buffer
-    @buffer_len = buffer.length
-    @command = Command.new(buffer[0], buffer[10], [])
-    @position = 11
-  end
-
-  def is_at_end
-    @position == @buffer_len
-  end
-
-  def deserialize
-    until is_at_end
-      @command = @command.add_arg_to_payload(read_object(@buffer[@position]))
-    end
-    @command
-  end
-
-  def read_object(type_num)
-    case type_num
-    when Type::COMMAND
-      return self.read_command
-    when Type::JAVONET_STRING
-      return self.read_string
-    when Type::JAVONET_INTEGER
-      return self.read_int
-    when Type::JAVONET_BOOLEAN
-      return self.read_bool
-    when Type::JAVONET_FLOAT
-      return self.read_float
-    when Type::JAVONET_BYTE
-      return self.read_byte
-    when Type::JAVONET_CHAR
-      return self.read_char
-    when Type::JAVONET_LONG_LONG
-      return self.read_longlong
-    when Type::JAVONET_DOUBLE
-      return self.read_double
-    when Type::JAVONET_UNSIGNED_LONG_LONG
-      return self.read_ullong
-    when Type::JAVONET_UNSIGNED_INTEGER
-      return self.read_uint
-    when Type::JAVONET_NULL
-      return self.read_nil
-    else
-      raise Exception.new("Type #{type_num} not supported in command deserializer")
-    end
-  end
-
-  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
-
-    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
-    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
-    string_encoding_mode = @buffer[p + 1]
-    size = TypeDeserializer.deserialize_int(@buffer[p + 2..p + 5])
-    @position += 6
-    p = @position
-    @position += size
-    TypeDeserializer.deserialize_string(string_encoding_mode, @buffer[p...p + size])
-  end
-
-  def read_int
-    size = 4
-    @position += 2
-    p = @position
-    @position += size
-    TypeDeserializer.deserialize_int(@buffer[p...p + size])
-  end
-
-  def read_bool
-    size = 1
-    @position += 2
-    p = @position
-    @position += size
-    TypeDeserializer.deserialize_bool(@buffer[p...p + size])
-  end
-
-  def read_float
-    size = 4
-    @position += 2
-    p = @position
-    @position += size
-    TypeDeserializer.deserialize_float(@buffer[p...p + size])
-  end
-
-  def read_byte
-    size = 1
-    @position += 2
-    p = @position
-    @position += size
-    TypeDeserializer.deserialize_byte(@buffer[p...p + size])
-  end
-
-  def read_char
-    size = 1
-    @position += 2
-    p = @position
-    @position += size
-    TypeDeserializer.deserialize_char(@buffer[p...p + size])
-  end
-
-  def read_longlong
-    size = 8
-    @position += 2
-    p = @position
-    @position += size
-    TypeDeserializer.deserialize_longlong(@buffer[p...p + size])
-  end
-
-  def read_double
-    size = 8
-    @position += 2
-    p = @position
-    @position += size
-    TypeDeserializer.deserialize_double(@buffer[p...p + size])
-  end
-
-  def read_ullong
-    size = 8
-    @position += 2
-    p = @position
-    @position += size
-    TypeDeserializer.deserialize_ullong(@buffer[p...p + size])
-  end
-
-  def read_uint
-    size = 4
-    @position += 2
-    p = @position
-    @position += size
-    TypeDeserializer.deserialize_uint(@buffer[p...p + size])
-  end
-
-  def read_nil
-    size = 1
-    @position += 2
-    p = @position
-    @position += size
-    TypeDeserializer.deserialize_nil(@buffer[p...p + size])
-  end
-end
+require_relative 'type_deserializer'
+require_relative '../../utils/type'
+require_relative '../../utils/command'
+require_relative '../../utils/string_encoding_mode_javonet'
+require_relative '../../utils/command_type'
+require_relative '../../utils/runtime_name_javonet'
+
+class CommandDeserializer
+  def initialize(buffer)
+    @buffer = buffer
+    @buffer_len = buffer.length
+    @command = Command.new(buffer[0], buffer[10], [])
+    @position = 11
+  end
+
+  def is_at_end
+    @position == @buffer_len
+  end
+
+  def deserialize
+    until is_at_end
+      @command = @command.add_arg_to_payload(read_object(@buffer[@position]))
+    end
+    @command
+  end
+
+  def read_object(type_num)
+    case type_num
+    when Type::COMMAND
+      return self.read_command
+    when Type::JAVONET_STRING
+      return self.read_string
+    when Type::JAVONET_INTEGER
+      return self.read_int
+    when Type::JAVONET_BOOLEAN
+      return self.read_bool
+    when Type::JAVONET_FLOAT
+      return self.read_float
+    when Type::JAVONET_BYTE
+      return self.read_byte
+    when Type::JAVONET_CHAR
+      return self.read_char
+    when Type::JAVONET_LONG_LONG
+      return self.read_longlong
+    when Type::JAVONET_DOUBLE
+      return self.read_double
+    when Type::JAVONET_UNSIGNED_LONG_LONG
+      return self.read_ullong
+    when Type::JAVONET_UNSIGNED_INTEGER
+      return self.read_uint
+    when Type::JAVONET_NULL
+      return self.read_nil
+    else
+      raise Exception.new("Type #{type_num} not supported in command deserializer")
+    end
+  end
+
+  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
+
+    payload = []
+    i = 0
+    while i < number_of_elements_in_payload
+      payload << read_object(@buffer[@position])
+      i += 1
+    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
+    string_encoding_mode = @buffer[p + 1]
+    size = TypeDeserializer.deserialize_int(@buffer[p + 2..p + 5])
+    @position += 6
+    p = @position
+    @position += size
+    TypeDeserializer.deserialize_string(string_encoding_mode, @buffer[p...p + size])
+  end
+
+  def read_int
+    size = 4
+    @position += 2
+    p = @position
+    @position += size
+    TypeDeserializer.deserialize_int(@buffer[p...p + size])
+  end
+
+  def read_bool
+    size = 1
+    @position += 2
+    p = @position
+    @position += size
+    TypeDeserializer.deserialize_bool(@buffer[p...p + size])
+  end
+
+  def read_float
+    size = 4
+    @position += 2
+    p = @position
+    @position += size
+    TypeDeserializer.deserialize_float(@buffer[p...p + size])
+  end
+
+  def read_byte
+    size = 1
+    @position += 2
+    p = @position
+    @position += size
+    TypeDeserializer.deserialize_byte(@buffer[p...p + size])
+  end
+
+  def read_char
+    size = 1
+    @position += 2
+    p = @position
+    @position += size
+    TypeDeserializer.deserialize_char(@buffer[p...p + size])
+  end
+
+  def read_longlong
+    size = 8
+    @position += 2
+    p = @position
+    @position += size
+    TypeDeserializer.deserialize_longlong(@buffer[p...p + size])
+  end
+
+  def read_double
+    size = 8
+    @position += 2
+    p = @position
+    @position += size
+    TypeDeserializer.deserialize_double(@buffer[p...p + size])
+  end
+
+  def read_ullong
+    size = 8
+    @position += 2
+    p = @position
+    @position += size
+    TypeDeserializer.deserialize_ullong(@buffer[p...p + size])
+  end
+
+  def read_uint
+    size = 4
+    @position += 2
+    p = @position
+    @position += size
+    TypeDeserializer.deserialize_uint(@buffer[p...p + size])
+  end
+
+  def read_nil
+    size = 1
+    @position += 2
+    p = @position
+    @position += size
+    TypeDeserializer.deserialize_nil(@buffer[p...p + size])
+  end
+end

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

@@ -1,39 +1,36 @@
-require_relative 'type_serializer'
-require_relative '../../utils/command'
-require_relative '../../utils/runtime_name_javonet'
-require_relative '../../utils/tcp_connection_data'
-
-class CommandSerializer
-  def serialize(root_command, connection_data = nil, runtime_version = 0)
-    buffer = []
-    buffer << root_command.runtime_name
-    buffer << runtime_version
-
-    if connection_data
-      buffer.concat(connection_data.serialize_connection_data)
-    else
-      buffer.concat([0, 0, 0, 0, 0, 0, 0])
-    end
-
-    buffer << RuntimeNameJavonet::RUBY
-    buffer << root_command.command_type
-
-    serialize_recursively(root_command, buffer)
-    buffer
-  end
-
-  def serialize_recursively(command, buffer)
-    command.payload.each do |item|
-      if item.is_a?(Command)
-        buffer.concat(TypeSerializer.serialize_command(item))
-        serialize_recursively(item, buffer)
-      elsif TypesHandler.primitive_or_none?(item)
-        buffer.concat(TypeSerializer.serialize_primitive(item))
-      else
-        cached_reference = ReferencesCache.new.cache_reference(item)
-        ref_command = Command.new(RuntimeNameJavonet::RUBY, CommandType::REFERENCE, cached_reference)
-        serialize_recursively(ref_command, buffer)
-      end
-    end
-  end
-end
+require_relative 'type_serializer'
+require_relative '../../utils/command'
+require_relative '../../utils/runtime_name_javonet'
+require_relative '../../utils/tcp_connection_data'
+
+class CommandSerializer
+  def serialize(root_command, connection_data = nil, runtime_version = 0)
+    buffer = ''.dup
+    buffer << [root_command.runtime_name, runtime_version].pack('C*')
+
+    if connection_data
+      buffer << connection_data.serialize_connection_data.pack('C*')
+    else
+      buffer << [0, 0, 0, 0, 0, 0, 0].pack('C*')
+    end
+    buffer << [RuntimeNameJavonet::RUBY, root_command.command_type].pack('C*')
+
+    # Payload (recursive)
+    serialize_recursively(root_command, buffer)
+
+    buffer.bytes
+  end
+
+  private
+
+  def serialize_recursively(command, buffer)
+    command.payload.each do |item|
+      if item.is_a?(Command)
+        buffer << TypeSerializer.serialize_command(item).pack('C*')
+        serialize_recursively(item, buffer)
+      else
+        buffer << TypeSerializer.serialize_primitive(item).pack('C*')
+      end
+    end
+  end
+end