javonet-ruby-sdk 2.5.4 → 2.5.5

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

@@ -23,7 +23,7 @@ class Transmitter
   end
 
   def self.activate(license_key)
-    activation_result = TransmitterWrapper.Activate(license_key, "", "", "")
+    activation_result = TransmitterWrapper.Activate(license_key)
     if activation_result < 0
       error_message = get_native_error
       raise Exception.new "Javonet activation result: " + activation_result.to_s + ". Native error message: " + error_message

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

@@ -25,7 +25,7 @@ module TransmitterWrapper
 
   attach_function :SendCommand, [:pointer, :int], :int
   attach_function :ReadResponse, [:pointer, :int], :int
-  attach_function :Activate, [:pointer, :pointer, :pointer, :pointer], :int
+  attach_function :Activate, [:pointer], :int
   attach_function :GetNativeError, [], :string
   attach_function :SetConfigSource, [:pointer], :int
 end

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

@@ -2,20 +2,28 @@ class RuntimeLogger
 
   @not_logged_yet = true
 
-  def self.get_runtime_info
+  def self.get_runtime_info(get_loaded_modules)
     begin
-      "Ruby Managed Runtime Info:\n" \
-        "Ruby Version: #{RUBY_VERSION}\n" \
-        "Ruby Implementation: #{RUBY_ENGINE}\n" \
-        "Current Directory: #{Dir.pwd}\n"
+      runtime_info = "Ruby Managed Runtime Info:\n".force_encoding('UTF-8') +
+        "Ruby Version: #{RUBY_VERSION}\n".force_encoding('UTF-8') +
+        "Ruby Implementation: #{RUBY_ENGINE}\n".force_encoding('UTF-8') +
+        "Ruby Platform: #{RUBY_PLATFORM}\n".force_encoding('UTF-8') +
+        "Ruby Engine: #{RUBY_ENGINE}\n".force_encoding('UTF-8') +
+        "Ruby Engine Version: #{RUBY_ENGINE_VERSION}\n".force_encoding('UTF-8') +
+        "Current Directory: #{Dir.pwd}\n".force_encoding('UTF-8') +
+        "Ruby search path: " + $LOAD_PATH.join(", ").force_encoding('UTF-8') + "\n"
+      if get_loaded_modules
+        runtime_info += "Ruby loaded modules (excluding Javonet classes): " + $LOADED_FEATURES.reject { |feature| feature.include?("Binaries/Ruby") }.join(", ").force_encoding('UTF-8') + "\n"
+      end
+        return runtime_info
     rescue => e
-      "Ruby Managed Runtime Info: Error while fetching runtime info"
+      "Ruby Managed Runtime Info: Error while fetching runtime info".force_encoding('UTF-8')
     end
   end
 
-  def self.print_runtime_info
+  def self.print_runtime_info(get_loaded_modules = true)
     if @not_logged_yet
-      puts get_runtime_info
+      puts get_runtime_info(get_loaded_modules)
       @not_logged_yet = false
     end
   end

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

@@ -30,4 +30,8 @@ class TcpConnectionData
   def get_port_bytes
     [@port & 0xFF, @port >> 8]
   end
+
+  def serialize_connection_data
+    [ConnectionType::TCP] + get_address_bytes + get_port_bytes
+  end
 end

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

@@ -1 +1 @@
-2.5.4
+2.5.5

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

@@ -5,8 +5,8 @@ require_relative '../handler/handler'
 class Interpreter
   @@handler = Handler.new
 
-  def execute(command, connection_type, tcp_connection_data)
-    message_byte_array = CommandSerializer.new.serialize(command, connection_type, tcp_connection_data)
+  def execute(command, connection_type, connection_data)
+    message_byte_array = CommandSerializer.new.serialize(command, connection_data)
     if command.runtime_name == RuntimeName::RUBY && connection_type == ConnectionType::IN_MEMORY
       require_relative '../receiver/receiver'
       response_byte_array = Receiver.new.send_command(message_byte_array, message_byte_array.length)
@@ -18,8 +18,8 @@ class Interpreter
     CommandDeserializer.new(response_byte_array).deserialize
   end
 
-  def process(byte_array, byte_array_len)
+  def process(byte_array)
     received_command = CommandDeserializer.new(byte_array).deserialize
-    CommandSerializer.new.serialize(@@handler.handle_command(received_command))
+    @@handler.handle_command(received_command)
   end
 end

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

@@ -1,78 +1,37 @@
 require_relative 'type_serializer'
-require_relative '../../utils/connection_type'
+require_relative '../../utils/command'
 require_relative '../../utils/runtime_name'
 require_relative '../../utils/tcp_connection_data'
 
 class CommandSerializer
-
   def initialize
-    @byte_buffer = []
-  end
-
-  def serialize(root_command, connection_type = ConnectionType::IN_MEMORY, tcp_connection_data = nil, runtime_version = 0)
-    queue = []
-    queue.unshift(root_command)
-    self.insert_into_buffer([root_command.runtime_name, runtime_version])
-    self.insert_into_buffer([connection_type])
-    self.insert_into_buffer(self.serialize_tcp(tcp_connection_data))
-    self.insert_into_buffer([RuntimeName::RUBY, root_command.command_type])
-    self.serialize_recursively(queue)
+    @buffer = []
   end
 
-  def serialize_tcp(tcp_connection_data)
-    if tcp_connection_data.nil?
-      return [0, 0, 0, 0, 0, 0]
+  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])
+    else
+      insert_into_buffer(connection_data.serialize_connection_data)
     end
-    tcp_connection_data.get_address_bytes + tcp_connection_data.get_port_bytes
+    insert_into_buffer([RuntimeName::PYTHON, root_command.command_type])
+    serialize_recursively(root_command)
+    @buffer
   end
 
-  def serialize_primitive(payload_item)
-    if payload_item.nil?
-      return TypeSerializer.serialize_nil
-    elsif [true, false].include? payload_item
-      return TypeSerializer.serialize_bool(payload_item)
-    elsif payload_item.is_a? Integer
-      if (-2 ** 31..2 ** 31).include?(payload_item)
-        return TypeSerializer.serialize_int(payload_item)
-      elsif (-2 ** 63..2 ** 63).include?(payload_item)
-        return TypeSerializer.serialize_longlong(payload_item)
+  def serialize_recursively(command)
+    command.payload.each do |item|
+      if item.is_a?(Command)
+        insert_into_buffer(TypeSerializer.serialize_command(item))
+        serialize_recursively(item)
       else
-        return TypeSerializer.serialize_ullong(payload_item)
+        insert_into_buffer(TypeSerializer.serialize_primitive(item))
       end
-    elsif payload_item.is_a? String
-      return TypeSerializer.serialize_string(payload_item)
-    elsif payload_item.is_a? Float
-      return TypeSerializer.serialize_double(payload_item)
-    elsif payload_item.is_a?
-    else
-      raise Exception.new("Payload not supported in command serializer")
     end
   end
 
   def insert_into_buffer(arguments)
-    @byte_buffer = @byte_buffer + arguments
+    @buffer += arguments
   end
-
-  def serialize_recursively(queue)
-    if queue.length == 0
-      return @byte_buffer
-    end
-    command = queue.shift
-    queue.unshift(command.drop_first_payload_argument)
-    if command.payload.length > 0
-      if command.payload[0].is_a? Command
-        inner_command = command.payload[0]
-        self.insert_into_buffer(TypeSerializer.serialize_command(inner_command))
-        queue.unshift(inner_command)
-      else
-        result = self.serialize_primitive(command.payload[0])
-        self.insert_into_buffer(result)
-        return self.serialize_recursively(queue)
-      end
-    else
-      queue.shift
-    end
-    self.serialize_recursively(queue)
-  end
-
 end

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

@@ -3,6 +3,29 @@ require_relative '../../utils/string_encoding_mode'
 
 class TypeSerializer
 
+  def self.serialize_primitive(payload_item)
+    if payload_item.nil?
+      return TypeSerializer.serialize_nil
+    elsif [true, false].include? payload_item
+      return TypeSerializer.serialize_bool(payload_item)
+    elsif payload_item.is_a? Integer
+      if (-2 ** 31..2 ** 31).include?(payload_item)
+        return TypeSerializer.serialize_int(payload_item)
+      elsif (-2 ** 63..2 ** 63).include?(payload_item)
+        return TypeSerializer.serialize_longlong(payload_item)
+      else
+        return TypeSerializer.serialize_ullong(payload_item)
+      end
+    elsif payload_item.is_a? String
+      return TypeSerializer.serialize_string(payload_item)
+    elsif payload_item.is_a? Float
+      return TypeSerializer.serialize_double(payload_item)
+    elsif payload_item.is_a?
+    else
+      raise Exception.new("Payload not supported in command serializer")
+    end
+  end
+
   def self.serialize_command(command)
     length = [command.payload.length].pack("i").bytes
     return [Type::COMMAND] + length + [command.runtime_name, command.command_type]

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

@@ -1,13 +1,15 @@
 require_relative '../interpreter/interpreter'
+require_relative '../../utils/runtime_logger'
+require_relative '../protocol/command_serializer'
 
 class Receiver
   
   def initialize
-    @@interpreter = Interpreter.new
+    RuntimeLogger.print_runtime_info
   end
 
   def send_command(message_array, message_array_len)
-    @@interpreter.process(message_array, message_array_len)
+    CommandSerializer.new.serialize(Interpreter.new.process(message_array))
   end
   
   def heart_beat(message_array, message_array_len)

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

@@ -23,7 +23,7 @@ class Transmitter
   end
 
   def self.activate(license_key)
-    activation_result = TransmitterWrapper.Activate(license_key, "", "", "")
+    activation_result = TransmitterWrapper.Activate(license_key)
     if activation_result < 0
       error_message = get_native_error
       raise Exception.new "Javonet activation result: " + activation_result.to_s + ". Native error message: " + error_message

data/lib/javonet-ruby-sdk/core/transmitter/transmitter_wrapper.rb

@@ -25,7 +25,7 @@ module TransmitterWrapper
 
   attach_function :SendCommand, [:pointer, :int], :int
   attach_function :ReadResponse, [:pointer, :int], :int
-  attach_function :Activate, [:pointer, :pointer, :pointer, :pointer], :int
+  attach_function :Activate, [:pointer], :int
   attach_function :GetNativeError, [], :string
   attach_function :SetConfigSource, [:pointer], :int
 end

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

@@ -3,6 +3,7 @@ require_relative './internal/abstract_config_runtime_factory'
 require_relative './runtime_context'
 require_relative './../utils/connection_type'
 require_relative './tools/json_file_resolver'
+require_relative './../core/transmitter/transmitter'
 
 # The ConfigRuntimeFactory class implements the AbstractConfigRuntimeFactory interface and provides methods for creating runtime contexts.
 # Each method corresponds to a specific runtime (CLR, JVM, .NET Core, Perl, Ruby, Node.js, Python) and returns a RuntimeContext instance for that runtime.
@@ -11,6 +12,7 @@ class ConfigRuntimeFactory < AbstractConfigRuntimeFactory
 
   def initialize(path)
     @path = path
+    Transmitter.set_config_source(path)
   end
 
   # Creates a RuntimeContext instance to interact with CLR runtime.

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

@@ -2,21 +2,18 @@ require_relative './runtime_factory'
 require_relative './config_runtime_factory'
 require_relative './../utils/connection_type'
 require_relative './../utils/tcp_connection_data'
+require_relative './../utils/runtime_logger'
 require_relative './../core/transmitter/transmitter'
 require_relative './tools/sdk_exception_helper'
 
+
 # The Javonet class is a singleton class that serves as the entry point for interacting with Javonet.
 # It provides methods to activate and initialize the Javonet SDK.
 # It supports both in-memory and TCP connections.
 # @see Refer to this {https://www.javonet.com/guides/v2/ruby/foundations/javonet-static-class article on Javonet Guides}
 class Javonet
-  begin
-    Transmitter.activate("")
-  rescue Exception => e
-    SdkExceptionHelper.send_exception_to_app_insights(e, "Javonet")
-    raise e
-  end
 
+  SdkExceptionHelper.send_exception_to_app_insights("SdkMessage", "Javonet SDK initialized")
 
   # Initializes Javonet using an in-memory channel on the same machine.
   # @return [RuntimeFactory] A RuntimeFactory instance configured for an in-memory connection.
@@ -39,7 +36,6 @@ class Javonet
   # @see Refer to this {https://www.javonet.com/guides/v2/ruby/foundations/configure-channel article on Javonet Guides}
   def self.with_config(path)
     begin
-      Transmitter.set_config_source(path)
       ConfigRuntimeFactory.new(path)
     rescue Exception => e
       SdkExceptionHelper.send_exception_to_app_insights(e, "withConfig")
@@ -50,15 +46,9 @@ class Javonet
 
   # Activates Javonet with the provided license key and optionally with proxy data.
   # @param license_key [String] The license key to activate Javonet.
-  # @param proxy_host [String] The host for the proxy server (optional).
-  # @param proxy_user_name [String] The username for the proxy server (optional).
-  # @param proxy_user_password [String] The password for the proxy server (optional).
   # @return [Integer] The activation status code.
   # @see https://www.javonet.com/guides/v2/ruby/getting-started/activating-javonet Activating Javonet Guide
   def self.activate(license_key)
-    proxy_host ||= ""
-    proxy_user_name ||= ""
-    proxy_password ||= ""
     begin
       return Transmitter.activate(license_key)
     rescue Exception => e
@@ -67,4 +57,8 @@ class Javonet
     end
   end
 
+  def get_runtime_info(get_loaded_modules)
+    RuntimeLogger.get_runtime_info(get_loaded_modules)
+  end
+
 end

data/lib/javonet-ruby-sdk/utils/runtime_logger.rb

@@ -2,20 +2,28 @@ class RuntimeLogger
 
   @not_logged_yet = true
 
-  def self.get_runtime_info
+  def self.get_runtime_info(get_loaded_modules)
     begin
-      "Ruby Managed Runtime Info:\n" \
-        "Ruby Version: #{RUBY_VERSION}\n" \
-        "Ruby Implementation: #{RUBY_ENGINE}\n" \
-        "Current Directory: #{Dir.pwd}\n"
+      runtime_info = "Ruby Managed Runtime Info:\n".force_encoding('UTF-8') +
+        "Ruby Version: #{RUBY_VERSION}\n".force_encoding('UTF-8') +
+        "Ruby Implementation: #{RUBY_ENGINE}\n".force_encoding('UTF-8') +
+        "Ruby Platform: #{RUBY_PLATFORM}\n".force_encoding('UTF-8') +
+        "Ruby Engine: #{RUBY_ENGINE}\n".force_encoding('UTF-8') +
+        "Ruby Engine Version: #{RUBY_ENGINE_VERSION}\n".force_encoding('UTF-8') +
+        "Current Directory: #{Dir.pwd}\n".force_encoding('UTF-8') +
+        "Ruby search path: " + $LOAD_PATH.join(", ").force_encoding('UTF-8') + "\n"
+      if get_loaded_modules
+        runtime_info += "Ruby loaded modules (excluding Javonet classes): " + $LOADED_FEATURES.reject { |feature| feature.include?("Binaries/Ruby") }.join(", ").force_encoding('UTF-8') + "\n"
+      end
+        return runtime_info
     rescue => e
-      "Ruby Managed Runtime Info: Error while fetching runtime info"
+      "Ruby Managed Runtime Info: Error while fetching runtime info".force_encoding('UTF-8')
     end
   end
 
-  def self.print_runtime_info
+  def self.print_runtime_info(get_loaded_modules = true)
     if @not_logged_yet
-      puts get_runtime_info
+      puts get_runtime_info(get_loaded_modules)
       @not_logged_yet = false
     end
   end

data/lib/javonet-ruby-sdk/utils/tcp_connection_data.rb

@@ -30,4 +30,8 @@ class TcpConnectionData
   def get_port_bytes
     [@port & 0xFF, @port >> 8]
   end
+
+  def serialize_connection_data
+    [ConnectionType::TCP] + get_address_bytes + get_port_bytes
+  end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: javonet-ruby-sdk
 version: !ruby/object:Gem::Version
-  version: 2.5.4
+  version: 2.5.5
 platform: ruby
 authors:
 - SdNCenter Sp. z o. o.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-05 00:00:00.000000000 Z
+date: 2024-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency