javonet-ruby-sdk 2.6.4 → 2.6.5

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

@@ -1,126 +1,65 @@
-require_relative '../../utils/string_encoding_mode_javonet'
-
-class TypeDeserializer
-
-  def self.deserialize_command(command_byte_array)
-    Command.new(RuntimeNameJavonet(command_byte_array[0]), CommandType(command_byte_array[1]), [])
-  end
-
-  def self.deserialize_string(string_encoding_mode, encoded_string)
-    raw_str = encoded_string.map(&:chr).join
-    case string_encoding_mode
-    when StringEncodingModeJavonet::ASCII
-      raw_str.force_encoding("US-ASCII").encode("UTF-8")
-    when StringEncodingModeJavonet::UTF8
-      raw_str.force_encoding("UTF-8").encode("UTF-8")
-    when StringEncodingModeJavonet::UTF16
-      raw_str.force_encoding("UTF-16LE").encode("UTF-8")
-    when StringEncodingModeJavonet::UTF32
-      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)
-    # Assuming a 32-bit little-endian integer.
-    value = 0
-    encoded_int.each_with_index do |byte, index|
-      value |= (byte & 0xFF) << (8 * index)
-    end
-    # Sign the extension if the 31st bit is set.
-    value -= (1 << 32) if (value & (1 << 31)) != 0
-    value
-  end
-
-  def self.deserialize_bool(encoded_bool)
-    encoded_bool[0] == 1
-  end
-
-  def self.deserialize_float(encoded_float)
-    # 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)
-    encoded_byte[0]
-  end
-
-  def self.deserialize_char(encoded_char)
-    encoded_char[0].ord
-  end
-
-  def self.deserialize_longlong(encoded_long)
-    # 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)
-    # 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)
-    # 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)
-    # 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)
-    nil
-  end
-
-end
+require_relative '../../utils/string_encoding_mode_javonet'
+
+class TypeDeserializer
+  def self.deserialize_command(command_byte_array)
+    Command.new(RuntimeNameJavonet(command_byte_array[0]),
+                CommandType(command_byte_array[1]),
+                [])
+  end
+
+  def self.deserialize_string(string_encoding_mode, encoded_string)
+    raw = encoded_string.pack('C*')
+    case string_encoding_mode
+    when StringEncodingModeJavonet::ASCII
+      raw.force_encoding('US-ASCII').encode('UTF-8')
+    when StringEncodingModeJavonet::UTF8
+      raw.force_encoding('UTF-8').encode('UTF-8')
+    when StringEncodingModeJavonet::UTF16
+      raw.force_encoding('UTF-16LE').encode('UTF-8')
+    when StringEncodingModeJavonet::UTF32
+      raw.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.pack('C*').unpack1('l<')     # 32-bit signed LE
+  end
+
+  def self.deserialize_bool(encoded_bool)
+    encoded_bool[0] == 1
+  end
+
+  def self.deserialize_float(encoded_float)
+    encoded_float.pack('C*').unpack1('e')    # 32-bit float LE (IEEE-754)
+  end
+
+  def self.deserialize_byte(encoded_byte)
+    encoded_byte.pack('C*').unpack1('C')     # or simply encoded_byte[0]
+  end
+
+  def self.deserialize_char(encoded_char)
+    encoded_char.pack('C*').unpack1('C')     # returns codepoint 0..255
+  end
+
+  def self.deserialize_longlong(encoded_long)
+    encoded_long.pack('C*').unpack1('q<')    # 64-bit signed LE
+  end
+
+  def self.deserialize_double(encoded_double)
+    encoded_double.pack('C*').unpack1('E')   # 64-bit double LE (IEEE-754)
+  end
+
+  def self.deserialize_ullong(encoded_ullong)
+    encoded_ullong.pack('C*').unpack1('Q<')  # 64-bit unsigned LE
+  end
+
+  def self.deserialize_uint(encoded_uint)
+    encoded_uint.pack('C*').unpack1('L<')    # 32-bit unsigned LE
+  end
+
+  def self.deserialize_nil(_encoded_nil)
+    nil
+  end
+end

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

@@ -1,260 +1,120 @@
-require_relative '../../utils/type'
-require_relative '../../utils/string_encoding_mode_javonet'
-
-class TypeSerializer
-
-  def self.serialize_primitive(payload_item)
-    if payload_item.nil?
-      return serialize_nil
-    elsif [true, false].include? payload_item
-      return serialize_bool(payload_item)
-    elsif payload_item.is_a? Integer
-      if (-2 ** 31..2 ** 31 - 1).include?(payload_item)
-        return serialize_int(payload_item)
-      elsif (-2 ** 63..2 ** 63 - 1).include?(payload_item)
-        return serialize_longlong(payload_item)
-      else
-        return serialize_ullong(payload_item)
-      end
-    elsif payload_item.is_a? String
-      return serialize_string(payload_item)
-    elsif payload_item.is_a? Float
-      return serialize_double(payload_item)
-    elsif payload_item.is_a?(FalseClass) || payload_item.is_a?(TrueClass)
-      return serialize_bool(payload_item)
-    else
-      raise TypeError, "Unsupported payload item type: #{payload_item.class} for payload item: #{payload_item}."
-    end
-  end
-
-  def self.serialize_command(command)
-    length = int_to_bytes(command.payload.length)
-    return [Type::COMMAND] + length + [command.runtime_name, command.command_type]
-  end
-
-  def self.serialize_string(string_value)
-    encoded_string_list = string_value.bytes
-    length = int_to_bytes(encoded_string_list.length)
-    return [Type::JAVONET_STRING, StringEncodingModeJavonet::UTF8] + length + encoded_string_list
-  end
-
-  def self.serialize_int(int_value)
-    encoded_int_list = int_to_bytes(int_value)
-    length = encoded_int_list.length
-    return [Type::JAVONET_INTEGER, length] + encoded_int_list
-  end
-
-  def self.serialize_bool(bool_value)
-    encoded_bool_list = bool_value ? [1] : [0]
-    length = encoded_bool_list.length
-    return [Type::JAVONET_BOOLEAN, length] + encoded_bool_list
-  end
-
-  def self.serialize_float(float_value)
-    encoded_float_list = float_to_bytes(float_value)
-    length = encoded_float_list.length
-    return [Type::JAVONET_FLOAT, length] + encoded_float_list
-  end
-
-  def self.serialize_byte(byte_value)
-    encoded_byte_list = [byte_value & 0xFF]
-    length = encoded_byte_list.length
-    return [Type::JAVONET_BYTE, length] + encoded_byte_list
-  end
-
-  def self.serialize_char(char_value)
-    encoded_char_list = [char_value & 0xFF]
-    length = encoded_char_list.length
-    return [Type::JAVONET_CHAR, length] + encoded_char_list
-  end
-
-  def self.serialize_longlong(longlong_value)
-    encoded_longlong_list = longlong_to_bytes(longlong_value)
-    length = encoded_longlong_list.length
-    return [Type::JAVONET_LONG_LONG, length] + encoded_longlong_list
-  end
-
-  def self.serialize_double(double_value)
-    encoded_double_list = double_to_bytes(double_value)
-    length = encoded_double_list.length
-    return [Type::JAVONET_DOUBLE, length] + encoded_double_list
-  end
-
-  def self.serialize_uint(uint_value)
-    encoded_uint_list = uint_to_bytes(uint_value)
-    length = encoded_uint_list.length
-    return [Type::JAVONET_UNSIGNED_INTEGER, length] + encoded_uint_list
-  end
-
-  def self.serialize_ullong(ullong_value)
-    encoded_ullong_list = ullong_to_bytes(ullong_value)
-    length = encoded_ullong_list.length
-    return [Type::JAVONET_UNSIGNED_LONG_LONG, length] + encoded_ullong_list
-  end
-
-  def self.serialize_nil
-    return [Type::JAVONET_NULL, 1, 0]
-  end
-
-  # Helper methods for byte conversion
-  def self.int_to_bytes(value)
-    # Convert to 4-byte (32-bit) integer, little-endian
-    [
-      value & 0xFF,
-      (value >> 8) & 0xFF,
-      (value >> 16) & 0xFF,
-      (value >> 24) & 0xFF
-    ]
-  end
-
-  def self.uint_to_bytes(value)
-    # Convert to 4-byte unsigned integer, little-endian
-    [
-      value & 0xFF,
-      (value >> 8) & 0xFF,
-      (value >> 16) & 0xFF,
-      (value >> 24) & 0xFF
-    ]
-  end
-
-  def self.longlong_to_bytes(value)
-    # Convert to 8-byte (64-bit) integer, little-endian
-    [
-      value & 0xFF,
-      (value >> 8) & 0xFF,
-      (value >> 16) & 0xFF,
-      (value >> 24) & 0xFF,
-      (value >> 32) & 0xFF,
-      (value >> 40) & 0xFF,
-      (value >> 48) & 0xFF,
-      (value >> 56) & 0xFF
-    ]
-  end
-
-  def self.ullong_to_bytes(value)
-    # Convert to 8-byte unsigned long long, little-endian
-    [
-      value & 0xFF,
-      (value >> 8) & 0xFF,
-      (value >> 16) & 0xFF,
-      (value >> 24) & 0xFF,
-      (value >> 32) & 0xFF,
-      (value >> 40) & 0xFF,
-      (value >> 48) & 0xFF,
-      (value >> 56) & 0xFF
-    ]
-  end
-
-  def self.float_to_bytes(value)
-    # IEEE 754 single-precision binary floating-point format (32-bit)
-    # Manual implementation without using pack
-    bits = 0
-
-    if value == 0
-      # Zero is a special case
-      return [0, 0, 0, 0]
-    elsif value.nan?
-      # NaN is another special case
-      bits = 0x7FC00000
-    elsif value.infinite?
-      # Handle infinity
-      bits = value > 0 ? 0x7F800000 : 0xFF800000
-    else
-      # Regular number
-      sign = value < 0 ? 1 : 0
-      value = value.abs
-
-      # Get exponent and fraction
-      exponent = Math.log2(value).floor
-      fraction = value / (2.0**exponent) - 1.0
-
-      # Normalize exponent for IEEE 754 bias
-      biased_exponent = exponent + 127
-
-      # Clamp exponent to valid range
-      if biased_exponent <= 0
-        # Denormalized values
-        biased_exponent = 0
-        fraction = value / (2.0**(-126))
-      elsif biased_exponent >= 255
-        # Overflow, return infinity
-        biased_exponent = 255
-        fraction = 0
-      end
-
-      # Assemble the bits
-      fraction_bits = (fraction * 0x800000).round & 0x7FFFFF
-      bits = (sign << 31) | (biased_exponent << 23) | fraction_bits
-    end
-
-    # Convert to bytes (little-endian)
-    [
-      bits & 0xFF,
-      (bits >> 8) & 0xFF,
-      (bits >> 16) & 0xFF,
-      (bits >> 24) & 0xFF
-    ]
-  end
-
-  def self.double_to_bytes(value)
-    # IEEE 754 double-precision binary floating-point format (64-bit)
-    # Manual implementation without using pack
-    bits_low = 0
-    bits_high = 0
-
-    if value == 0
-      # Zero is a special case
-      return [0, 0, 0, 0, 0, 0, 0, 0]
-    elsif value.nan?
-      # NaN is another special case
-      bits_high = 0x7FF80000
-      bits_low = 0
-    elsif value.infinite?
-      # Handle infinity
-      bits_high = value > 0 ? 0x7FF00000 : 0xFFF00000
-      bits_low = 0
-    else
-      # Regular number
-      sign = value < 0 ? 1 : 0
-      value = value.abs
-
-      # Get exponent and fraction
-      exponent = Math.log2(value).floor
-      fraction = value / (2.0**exponent) - 1.0
-
-      # Normalize exponent for IEEE 754 bias
-      biased_exponent = exponent + 1023
-
-      # Clamp exponent to valid range
-      if biased_exponent <= 0
-        # Denormalized values
-        biased_exponent = 0
-        fraction = value / (2.0**(-1022))
-      elsif biased_exponent >= 2047
-        # Overflow, return infinity
-        biased_exponent = 2047
-        fraction = 0
-      end
-
-      # Assemble the bits
-      # Convert a fraction to 52-bit integer
-      fraction_bits = (fraction * 0x10000000000000).round
-
-      # Split into high and low 32-bit words
-      bits_high = (sign << 31) | (biased_exponent << 20) | ((fraction_bits >> 32) & 0xFFFFF)
-      bits_low = fraction_bits & 0xFFFFFFFF
-    end
-
-    # Convert to bytes (little-endian)
-    [
-      bits_low & 0xFF,
-      (bits_low >> 8) & 0xFF,
-      (bits_low >> 16) & 0xFF,
-      (bits_low >> 24) & 0xFF,
-      bits_high & 0xFF,
-      (bits_high >> 8) & 0xFF,
-      (bits_high >> 16) & 0xFF,
-      (bits_high >> 24) & 0xFF
-    ]
-  end
-end
+require_relative '../../utils/type'
+require_relative '../../utils/string_encoding_mode_javonet'
+
+class TypeSerializer
+  def self.serialize_primitive(payload_item)
+    if payload_item.nil?
+      serialize_nil
+    elsif [true, false].include?(payload_item)
+      serialize_bool(payload_item)
+    elsif payload_item.is_a?(Integer)
+      if (-2**31..2**31 - 1).include?(payload_item)
+        serialize_int(payload_item)
+      elsif (-2**63..2**63 - 1).include?(payload_item)
+        serialize_longlong(payload_item)
+      else
+        serialize_ullong(payload_item)
+      end
+    elsif payload_item.is_a?(String)
+      serialize_string(payload_item)
+    elsif payload_item.is_a?(Float)
+      serialize_double(payload_item)
+    elsif payload_item.is_a?(FalseClass) || payload_item.is_a?(TrueClass)
+      serialize_bool(payload_item)
+    else
+      raise TypeError, "Unsupported payload item type: #{payload_item.class} for payload item: #{payload_item}."
+    end
+  end
+
+  def self.serialize_command(command)
+    length = int_to_bytes(command.payload.length)
+    [Type::COMMAND] + length + [command.runtime_name, command.command_type]
+  end
+
+  def self.serialize_string(string_value)
+    encoded_string_list = string_value.bytes
+    length = int_to_bytes(encoded_string_list.length)
+    [Type::JAVONET_STRING, StringEncodingModeJavonet::UTF8] + length + encoded_string_list
+  end
+
+  def self.serialize_int(int_value)
+    encoded_int_list = int_to_bytes(int_value)
+    [Type::JAVONET_INTEGER, encoded_int_list.length] + encoded_int_list
+  end
+
+  def self.serialize_bool(bool_value)
+    encoded_bool_list = bool_value ? [1] : [0]
+    [Type::JAVONET_BOOLEAN, encoded_bool_list.length] + encoded_bool_list
+  end
+
+  def self.serialize_float(float_value)
+    encoded_float_list = float_to_bytes(float_value)
+    [Type::JAVONET_FLOAT, encoded_float_list.length] + encoded_float_list
+  end
+
+  def self.serialize_byte(byte_value)
+    encoded_byte_list = [byte_value].pack('C').bytes
+    [Type::JAVONET_BYTE, encoded_byte_list.length] + encoded_byte_list
+  end
+
+  def self.serialize_char(char_value)
+    encoded_char_list = [char_value].pack('C').bytes
+    [Type::JAVONET_CHAR, encoded_char_list.length] + encoded_char_list
+  end
+
+  def self.serialize_longlong(longlong_value)
+    encoded_longlong_list = longlong_to_bytes(longlong_value)
+    [Type::JAVONET_LONG_LONG, encoded_longlong_list.length] + encoded_longlong_list
+  end
+
+  def self.serialize_double(double_value)
+    encoded_double_list = double_to_bytes(double_value)
+    [Type::JAVONET_DOUBLE, encoded_double_list.length] + encoded_double_list
+  end
+
+  def self.serialize_uint(uint_value)
+    encoded_uint_list = uint_to_bytes(uint_value)
+    [Type::JAVONET_UNSIGNED_INTEGER, encoded_uint_list.length] + encoded_uint_list
+  end
+
+  def self.serialize_ullong(ullong_value)
+    encoded_ullong_list = ullong_to_bytes(ullong_value)
+    [Type::JAVONET_UNSIGNED_LONG_LONG, encoded_ullong_list.length] + encoded_ullong_list
+  end
+
+  def self.serialize_nil
+    [Type::JAVONET_NULL, 1, 0]
+  end
+
+  # -------- pack(...).bytes helpers (little-endian) --------
+
+  # 32-bit signed int → LE bytes
+  def self.int_to_bytes(value)
+    [value].pack('l<').bytes
+  end
+
+  # 32-bit unsigned int → LE bytes
+  def self.uint_to_bytes(value)
+    [value].pack('L<').bytes
+  end
+
+  # 64-bit signed → LE bytes
+  def self.longlong_to_bytes(value)
+    [value].pack('q<').bytes
+  end
+
+  # 64-bit unsigned → LE bytes
+  def self.ullong_to_bytes(value)
+    [value].pack('Q<').bytes
+  end
+
+  # 32-bit IEEE-754 float → LE bytes
+  def self.float_to_bytes(value)
+    [value].pack('e').bytes   # little-endian float
+  end
+
+  # 64-bit IEEE-754 double → LE bytes
+  def self.double_to_bytes(value)
+    [value].pack('E').bytes   # little-endian double
+  end
+end

data/lib/javonet-ruby-sdk/core/receiver/receiver_new.rb

@@ -1,42 +1,42 @@
-require_relative '../interpreter/interpreter'
-require_relative '../../utils/runtime_logger'
-require_relative '../protocol/command_serializer'
-require_relative '../../utils/command'
-require_relative '../../utils/os_helper'
-
-class Receiver
-
-  def initialize
-    puts get_runtime_info
-  end
-
-  def send_command(message_array, message_array_len)
-    begin
-      response_array = CommandSerializer.new.serialize(Interpreter.new.process(message_array))
-    rescue Exception => e
-      message = "Error occurred in Javonet Ruby Core: #{e.message}"
-      puts message
-      exception_command = Command.new(RuntimeNameJavonet::RUBY, CommandType::EXCEPTION, [])
-      exception_command = exception_command.add_arg_to_payload(ExceptionType::EXCEPTION)
-      exception_command = exception_command.add_arg_to_payload(Command.new(RuntimeNameJavonet::RUBY, CommandType::EXCEPTION, ["Ruby Core Error", "Ruby Core Error"]).to_string)
-      exception_command = exception_command.add_arg_to_payload("Ruby Core Error")
-      exception_command = exception_command.add_arg_to_payload(e.message)
-      exception_command = exception_command.add_arg_to_payload("Receiver")
-      exception_command = exception_command.add_arg_to_payload("send_command")
-      exception_command = exception_command.add_arg_to_payload("undefined")
-      exception_command = exception_command.add_arg_to_payload(__FILE__)
-      response_array = CommandSerializer.new.serialize(exception_command)
-    end
-      [response_array.length, response_array]
-  end
-
-  def heart_beat(message_array, message_array_len)
-    response_array = [49, 48]
-    [response_array.length, response_array]
-  end
-
-  def get_runtime_info
-    RuntimeLogger.get_runtime_info(true)
-  end
-end
-
+require_relative '../interpreter/interpreter'
+require_relative '../../utils/runtime_logger'
+require_relative '../protocol/command_serializer'
+require_relative '../../utils/command'
+require_relative '../../utils/os_helper'
+
+class Receiver
+
+  def initialize
+
+  end
+
+  def send_command(message_array, message_array_len)
+    begin
+      response_array = CommandSerializer.new.serialize(Interpreter.new.process(message_array))
+    rescue Exception => e
+      message = "Error occurred in Javonet Ruby Core: #{e.message}"
+      puts message
+      exception_command = Command.new(RuntimeNameJavonet::RUBY, CommandType::EXCEPTION, [])
+      exception_command = exception_command.add_arg_to_payload(ExceptionType::EXCEPTION)
+      exception_command = exception_command.add_arg_to_payload(Command.new(RuntimeNameJavonet::RUBY, CommandType::EXCEPTION, ["Ruby Core Error", "Ruby Core Error"]).to_string)
+      exception_command = exception_command.add_arg_to_payload("Ruby Core Error")
+      exception_command = exception_command.add_arg_to_payload(e.message)
+      exception_command = exception_command.add_arg_to_payload("Receiver")
+      exception_command = exception_command.add_arg_to_payload("send_command")
+      exception_command = exception_command.add_arg_to_payload("undefined")
+      exception_command = exception_command.add_arg_to_payload(__FILE__)
+      response_array = CommandSerializer.new.serialize(exception_command)
+    end
+      [response_array.length, response_array]
+  end
+
+  def heart_beat(message_array, message_array_len)
+    response_array = [49, 48]
+    [response_array.length, response_array]
+  end
+
+  def get_runtime_info
+    RuntimeLogger.get_runtime_info(true)
+  end
+end
+