javonet-ruby-sdk 2.5.13 → 2.5.14

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,12 +24,7 @@ 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)
+    def read_object(type_num)
     case type_num
     when Type::COMMAND
       return self.read_command
@@ -65,19 +61,30 @@ 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)
-    end
-  end
+    payload = number_of_elements_in_payload.times.map { read_object(@buffer[@position]) }
+    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 +93,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 +101,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 +109,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 +117,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 +125,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 +133,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 +141,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 +149,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 +157,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 +165,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 +173,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,27 @@ 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 = ''.dup
+    buffer << [root_command.runtime_name, runtime_version].pack('C*')
+    if connection_data
+      buffer << connection_data.serialize_connection_data.pack('C*')
     else
-      insert_into_buffer(connection_data.serialize_connection_data)
+      buffer << [0, 0, 0, 0, 0, 0, 0].pack('C*')
     end
-    insert_into_buffer([RuntimeName::PYTHON, root_command.command_type])
-    serialize_recursively(root_command)
-    @buffer
+    buffer << [RuntimeName::RUBY, root_command.command_type].pack('C*')
+    serialize_recursively(root_command, buffer)
+    buffer.bytes
   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 << TypeSerializer.serialize_command(item).pack('C*')
+        serialize_recursively(item, buffer)
       else
-        insert_into_buffer(TypeSerializer.serialize_primitive(item))
+        buffer << TypeSerializer.serialize_primitive(item).pack('C*')
       end
     end
   end
-
-  def insert_into_buffer(arguments)
-    @buffer += arguments
-  end
 end

data/lib/javonet-ruby-sdk/sdk/invocation_context.rb

@@ -299,10 +299,8 @@ class InvocationContext < AbstractInvocationContext
       return payload_item.current_command
 
     elsif payload_item.is_a? Array
-      payload_item.each_index { |i|
-        payload_item[i] = encapsulate_payload_item(payload_item[i])
-      }
-      return Command.new(@runtime_name, CommandType::ARRAY, [*payload_item])
+      copied_array = payload_item.map { |item| encapsulate_payload_item(item) }
+      return Command.new(@runtime_name, CommandType::ARRAY, copied_array)
     else
       return Command.new(@runtime_name, CommandType::VALUE, payload_item.nil? ? [nil] : [*payload_item])
     end

data/lib/javonet-ruby-sdk/sdk/runtime_context.rb

@@ -181,11 +181,8 @@ class RuntimeContext < AbstractRuntimeContext
       return payload_item.current_command
 
     elsif payload_item.is_a? Array
-      payload_item.each_index { |i|
-        payload_item[i] = encapsulate_payload_item(payload_item[i])
-      }
-      return Command.new(@runtime_name, CommandType::ARRAY, [*payload_item])
-
+      copied_array = payload_item.map { |item| encapsulate_payload_item(item) }
+      return Command.new(@runtime_name, CommandType::ARRAY, copied_array)
     else
       return Command.new(@runtime_name, CommandType::VALUE, payload_item.nil? ? [nil] : [*payload_item])
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: javonet-ruby-sdk
 version: !ruby/object:Gem::Version
-  version: 2.5.13
+  version: 2.5.14
 platform: ruby
 authors:
 - SdNCenter Sp. z o. o.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-12 00:00:00.000000000 Z
+date: 2025-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi