javonet-ruby-sdk 2.2.0 → 2.4.0

data/lib/javonet-ruby-sdk/Binaries/Python/Windows/X64/javonet/utils/RuntimeNameHandler.py

@@ -0,0 +1,26 @@
+from javonet.utils.RuntimeName import RuntimeName
+
+
+class RuntimeNameHandler:
+
+    @staticmethod
+    def get_name(runtime_name):
+        if isinstance(runtime_name, RuntimeName):
+            if runtime_name == RuntimeName.clr:
+                return "clr"
+            elif runtime_name == RuntimeName.go:
+                return "go"
+            elif runtime_name == RuntimeName.jvm:
+                return "jvm"
+            elif runtime_name == RuntimeName.netcore:
+                return "netcore"
+            elif runtime_name == RuntimeName.perl:
+                return "perl"
+            elif runtime_name == RuntimeName.python:
+                return "python"
+            elif runtime_name == RuntimeName.ruby:
+                return "ruby"
+            elif runtime_name == RuntimeName.nodejs:
+                return "nodejs"
+        else:
+            raise Exception("Invalid runtime name.")

data/lib/javonet-ruby-sdk/Binaries/Python/Windows/X64/javonet/utils/TcpConnectionData.py

@@ -0,0 +1,29 @@
+import socket
+import hashlib
+
+
+class TcpConnectionData:
+    def __init__(self, hostname, port):
+        self.port = port
+        if hostname == "localhost":
+            self.ip_address = "127.0.0.1"
+        else:
+            try:
+                self.ip_address = socket.gethostbyname(hostname)
+            except socket.gaierror:
+                raise ValueError("Unable to resolve hostname to an IP address.")
+
+    def __eq__(self, other):
+        if isinstance(other, TcpConnectionData):
+            return self.ip_address == other.ip_address and self.port == other.port
+        return False
+
+    def __hash__(self):
+        return int(hashlib.sha1(f"{self.ip_address}{self.port}".encode()).hexdigest(), 16)
+
+    def get_address_bytes(self):
+        return [int(x) for x in self.ip_address.split(".")]
+
+    def get_pot_bytes(self):
+        return [self.port & 0xFF, self.port >> 8]
+

data/lib/javonet-ruby-sdk/Binaries/Ruby/Linux/X64/core/interpreter/interpreter.rb

@@ -3,11 +3,11 @@ require_relative '../protocol/command_deserializer'
 require_relative '../handler/handler'
 
 class Interpreter
-  def execute(command, connection_type, tcp_address)
+  def execute(command, connection_type, tcp_connection_data)
 
     command_serializer = CommandSerializer.new
-    message_byte_array = command_serializer.serialize(command, connection_type, tcp_address)
-    if command.runtime_name == RuntimeName::RUBY
+    message_byte_array = command_serializer.serialize(command, connection_type, tcp_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)
     else
@@ -16,8 +16,7 @@ class Interpreter
     end
 
     command_deserializer = CommandDeserializer.new(response_byte_array,response_byte_array.length)
-    encoded_response = command_deserializer.deserialize
-    return encoded_response
+    command_deserializer.deserialize
   end
 
   def process(byte_array, byte_array_len)
@@ -25,6 +24,6 @@ class Interpreter
     received_command = command_deserializer.deserialize
     handler = Handler.new
     command_serializer = CommandSerializer.new
-    return command_serializer.serialize(handler.handle_command(received_command), 0, "0.0.0.0:0")
+    command_serializer.serialize(handler.handle_command(received_command))
   end
 end

data/lib/javonet-ruby-sdk/Binaries/Ruby/Linux/X64/core/protocol/command_serializer.rb

@@ -1,6 +1,7 @@
 require_relative 'type_serializer'
 require_relative '../../utils/connection_type'
 require_relative '../../utils/runtime_name'
+require_relative '../../utils/tcp_connection_data'
 
 class CommandSerializer
 
@@ -8,38 +9,21 @@ class CommandSerializer
     @byte_buffer = []
   end
 
-  def serialize(root_command, connection_type = ConnectionType::IN_MEMORY, tcp_address = nil, runtime_version = 0)
+  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])
-    if connection_type == ConnectionType::TCP
-      self.insert_into_buffer([ConnectionType::TCP])
-      self.insert_into_buffer(self.serialize_tcp(tcp_address))
-    end
-    if connection_type == ConnectionType::IN_MEMORY
-      self.insert_into_buffer([ConnectionType::IN_MEMORY])
-      self.insert_into_buffer([0, 0, 0, 0, 0, 0])
-    end
+    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)
   end
 
-  def serialize_tcp(tcp_address)
-    if tcp_address.kind_of?(Array)
-      tcp_address
-    else
-      tcp_address_array = tcp_address.split(':')
-      tcp_address_ip = tcp_address_array[0].split('.')
-      tcp_address_port = tcp_address_array[1]
-      tcp_address_bytearray = []
-      tcp_address_ip.each { |address|
-        tcp_address_bytearray.concat([address.to_i])
-      }
-      port_byte = [tcp_address_port.to_i].pack("s_").bytes
-      tcp_address_bytearray.concat(port_byte)
-      tcp_address_bytearray
+  def serialize_tcp(tcp_connection_data)
+    if tcp_connection_data.nil?
+      return [0, 0, 0, 0, 0, 0]
     end
-
+    tcp_connection_data.get_address_bytes + tcp_connection_data.get_port_bytes
   end
 
   def serialize_primitive(payload_item)

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

@@ -4,10 +4,6 @@ require_relative 'transmitter_wrapper'
 
 class Transmitter
 
-  def self.get_native_error
-    TransmitterWrapper.GetNativeError
-  end
-
   def self.send_command(message_byte_array, message_byte_array_len)
     message = FFI::MemoryPointer.new(:uchar, message_byte_array_len, true)
     message.put_array_of_uchar(0, message_byte_array)
@@ -26,26 +22,39 @@ class Transmitter
     end
   end
 
-  def self.activate_with_licence_file()
+  def self.activate_with_license_file()
     return activate()
   end
 
-  def self.activate_with_credentials(licenceKey)
-    return activate(licenceKey)
+  def self.activate_with_credentials(licenseKey)
+    return activate(licenseKey)
   end
 
-  def self.activate_with_credentials_and_proxy(licenceKey, proxyHost, proxyUserName, proxyPassword)
-    return activate(licenceKey, proxyHost, proxyUserName, proxyPassword)
+  def self.activate_with_credentials_and_proxy(licenseKey, proxyHost, proxyUserName, proxyPassword)
+    return activate(licenseKey, proxyHost, proxyUserName, proxyPassword)
   end
 
-  private_class_method def self.activate(licenceKey = "", proxyHost = "", proxyUserName = "", proxyUserPassword = "")
-    activation_result = TransmitterWrapper.Activate(licenceKey, proxyHost, proxyUserName, proxyUserPassword)
+  private_class_method def self.activate(licenseKey = "", proxyHost = "", proxyUserName = "", proxyUserPassword = "")
+    activation_result = TransmitterWrapper.Activate(licenseKey, proxyHost, proxyUserName, proxyUserPassword)
     if activation_result < 0
       error_message = get_native_error
-      raise Exception.new "Javonet activation result: " + activation_result.to_s + ". " + error_message
+      raise Exception.new "Javonet activation result: " + activation_result.to_s + ". Native error message: " + error_message
     else
       return activation_result
     end
   end
 
+  def self.get_native_error
+    TransmitterWrapper.GetNativeError
+  end
+
+  def self.set_config_source(configPath)
+    set_config_result = TransmitterWrapper.SetConfigSource(configPath)
+    if set_config_result < 0
+      error_message = get_native_error
+      raise Exception.new "Javonet set config source result: " + set_config_result.to_s + ". Native error message: " + error_message
+    else
+      return set_config_result
+    end
+  end
 end

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

@@ -12,5 +12,5 @@ module TransmitterWrapper
   attach_function :ReadResponse, [:pointer, :int], :int
   attach_function :Activate, [:pointer, :pointer, :pointer, :pointer], :int
   attach_function :GetNativeError, [], :string
-
+  attach_function :SetConfigSource, [:pointer], :int
 end

data/lib/javonet-ruby-sdk/Binaries/Ruby/Linux/X64/utils/command.rb

@@ -1,4 +1,5 @@
 require_relative 'runtime_name'
+require_relative 'runtime_name_handler'
 require_relative 'command_type'
 
 class Command
@@ -57,7 +58,7 @@ class Command
   end
 
   def to_string
-    'Runtime Library: ' + RuntimeName.get_name(@runtime_name).to_s + ' ' + 'Ruby command type: ' + CommandType.get_name(@command_type).to_s + ' ' + 'with parameters: ' + @payload.to_s
+    'Runtime Library: ' + RuntimeNameHandler.get_name(@runtime_name) + ' ' + 'Ruby command type: ' + CommandType.get_name(@command_type).to_s + ' ' + 'with parameters: ' + @payload.to_s
   end
 
   def eql?(other)

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

@@ -8,34 +8,4 @@ module RuntimeName
   RUBY = 6
   NODEJS = 7
   CPP = 8
-
-  def self.get_name(runtime_number)
-    if runtime_number == 0
-      return 'CLR'
-    end
-    if runtime_number == 1
-      return 'GO'
-    end
-    if runtime_number == 2
-      return 'JVM'
-    end
-    if runtime_number == 3
-      return 'NETCORE'
-    end
-    if runtime_number == 4
-      return 'PERL'
-    end
-    if runtime_number == 5
-      return 'PYTHON'
-    end
-    if runtime_number == 6
-      return 'RUBY'
-    end
-    if runtime_number == 7
-      return 'NODEJS'
-    end
-    if runtime_number == 8
-      return 'CPP'
-    end
-  end
 end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+require_relative './runtime_name'
+
+class RuntimeNameHandler
+  def self.get_name(runtime_name)
+    if runtime_name == RuntimeName::CLR
+      return 'clr'
+    end
+    if runtime_name == RuntimeName::GO
+      return 'go'
+    end
+    if runtime_name == RuntimeName::JVM
+      return 'jvm'
+    end
+    if runtime_name == RuntimeName::NETCORE
+      return 'netcore'
+    end
+    if runtime_name == RuntimeName::PERL
+      return 'perl'
+    end
+    if runtime_name == RuntimeName::PYTHON
+      return 'python'
+    end
+    if runtime_name == RuntimeName::RUBY
+      return 'ruby'
+    end
+    if runtime_name == RuntimeName::NODEJS
+      return 'nodejs'
+    end
+    if runtime_name == RuntimeName::CPP
+      return 'cpp'
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+class TcpConnectionData
+  attr_reader :ip_address, :port
+
+  def initialize(hostname, port)
+    @port = port
+    if hostname == "localhost"
+      @ip_address = "127.0.0.1"
+    else
+      begin
+        @ip_address = IPSocket.getaddress(hostname)
+      rescue SocketError
+        raise "Unable to resolve hostname to an IP address."
+      end
+    end
+  end
+
+  def ==(other)
+    other.is_a?(TcpConnectionData) && @ip_address == other.ip_address && @port == other.port
+  end
+
+  def to_s
+    "#{@ip_address}:#{@port}"
+
+  end
+
+  def get_address_bytes
+    @ip_address.split(".").map(&:to_i)
+  end
+
+  def get_port_bytes
+    [@port & 0xFF, @port >> 8]
+  end
+end

data/lib/javonet-ruby-sdk/Binaries/Ruby/MacOs/X64/core/interpreter/interpreter.rb

@@ -3,11 +3,11 @@ require_relative '../protocol/command_deserializer'
 require_relative '../handler/handler'
 
 class Interpreter
-  def execute(command, connection_type, tcp_address)
+  def execute(command, connection_type, tcp_connection_data)
 
     command_serializer = CommandSerializer.new
-    message_byte_array = command_serializer.serialize(command, connection_type, tcp_address)
-    if command.runtime_name == RuntimeName::RUBY
+    message_byte_array = command_serializer.serialize(command, connection_type, tcp_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)
     else
@@ -16,8 +16,7 @@ class Interpreter
     end
 
     command_deserializer = CommandDeserializer.new(response_byte_array,response_byte_array.length)
-    encoded_response = command_deserializer.deserialize
-    return encoded_response
+    command_deserializer.deserialize
   end
 
   def process(byte_array, byte_array_len)
@@ -25,6 +24,6 @@ class Interpreter
     received_command = command_deserializer.deserialize
     handler = Handler.new
     command_serializer = CommandSerializer.new
-    return command_serializer.serialize(handler.handle_command(received_command), 0, "0.0.0.0:0")
+    command_serializer.serialize(handler.handle_command(received_command))
   end
 end

data/lib/javonet-ruby-sdk/Binaries/Ruby/MacOs/X64/core/protocol/command_serializer.rb

@@ -1,6 +1,7 @@
 require_relative 'type_serializer'
 require_relative '../../utils/connection_type'
 require_relative '../../utils/runtime_name'
+require_relative '../../utils/tcp_connection_data'
 
 class CommandSerializer
 
@@ -8,38 +9,21 @@ class CommandSerializer
     @byte_buffer = []
   end
 
-  def serialize(root_command, connection_type = ConnectionType::IN_MEMORY, tcp_address = nil, runtime_version = 0)
+  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])
-    if connection_type == ConnectionType::TCP
-      self.insert_into_buffer([ConnectionType::TCP])
-      self.insert_into_buffer(self.serialize_tcp(tcp_address))
-    end
-    if connection_type == ConnectionType::IN_MEMORY
-      self.insert_into_buffer([ConnectionType::IN_MEMORY])
-      self.insert_into_buffer([0, 0, 0, 0, 0, 0])
-    end
+    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)
   end
 
-  def serialize_tcp(tcp_address)
-    if tcp_address.kind_of?(Array)
-      tcp_address
-    else
-      tcp_address_array = tcp_address.split(':')
-      tcp_address_ip = tcp_address_array[0].split('.')
-      tcp_address_port = tcp_address_array[1]
-      tcp_address_bytearray = []
-      tcp_address_ip.each { |address|
-        tcp_address_bytearray.concat([address.to_i])
-      }
-      port_byte = [tcp_address_port.to_i].pack("s_").bytes
-      tcp_address_bytearray.concat(port_byte)
-      tcp_address_bytearray
+  def serialize_tcp(tcp_connection_data)
+    if tcp_connection_data.nil?
+      return [0, 0, 0, 0, 0, 0]
     end
-
+    tcp_connection_data.get_address_bytes + tcp_connection_data.get_port_bytes
   end
 
   def serialize_primitive(payload_item)

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

@@ -4,10 +4,6 @@ require_relative 'transmitter_wrapper'
 
 class Transmitter
 
-  def self.get_native_error
-    TransmitterWrapper.GetNativeError
-  end
-
   def self.send_command(message_byte_array, message_byte_array_len)
     message = FFI::MemoryPointer.new(:uchar, message_byte_array_len, true)
     message.put_array_of_uchar(0, message_byte_array)
@@ -26,26 +22,39 @@ class Transmitter
     end
   end
 
-  def self.activate_with_licence_file()
+  def self.activate_with_license_file()
     return activate()
   end
 
-  def self.activate_with_credentials(licenceKey)
-    return activate(licenceKey)
+  def self.activate_with_credentials(licenseKey)
+    return activate(licenseKey)
   end
 
-  def self.activate_with_credentials_and_proxy(licenceKey, proxyHost, proxyUserName, proxyPassword)
-    return activate(licenceKey, proxyHost, proxyUserName, proxyPassword)
+  def self.activate_with_credentials_and_proxy(licenseKey, proxyHost, proxyUserName, proxyPassword)
+    return activate(licenseKey, proxyHost, proxyUserName, proxyPassword)
   end
 
-  private_class_method def self.activate(licenceKey = "", proxyHost = "", proxyUserName = "", proxyUserPassword = "")
-    activation_result = TransmitterWrapper.Activate(licenceKey, proxyHost, proxyUserName, proxyUserPassword)
+  private_class_method def self.activate(licenseKey = "", proxyHost = "", proxyUserName = "", proxyUserPassword = "")
+    activation_result = TransmitterWrapper.Activate(licenseKey, proxyHost, proxyUserName, proxyUserPassword)
     if activation_result < 0
       error_message = get_native_error
-      raise Exception.new "Javonet activation result: " + activation_result.to_s + ". " + error_message
+      raise Exception.new "Javonet activation result: " + activation_result.to_s + ". Native error message: " + error_message
     else
       return activation_result
     end
   end
 
+  def self.get_native_error
+    TransmitterWrapper.GetNativeError
+  end
+
+  def self.set_config_source(configPath)
+    set_config_result = TransmitterWrapper.SetConfigSource(configPath)
+    if set_config_result < 0
+      error_message = get_native_error
+      raise Exception.new "Javonet set config source result: " + set_config_result.to_s + ". Native error message: " + error_message
+    else
+      return set_config_result
+    end
+  end
 end

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

@@ -12,5 +12,5 @@ module TransmitterWrapper
   attach_function :ReadResponse, [:pointer, :int], :int
   attach_function :Activate, [:pointer, :pointer, :pointer, :pointer], :int
   attach_function :GetNativeError, [], :string
-
+  attach_function :SetConfigSource, [:pointer], :int
 end

data/lib/javonet-ruby-sdk/Binaries/Ruby/MacOs/X64/utils/command.rb

@@ -1,4 +1,5 @@
 require_relative 'runtime_name'
+require_relative 'runtime_name_handler'
 require_relative 'command_type'
 
 class Command
@@ -57,7 +58,7 @@ class Command
   end
 
   def to_string
-    'Runtime Library: ' + RuntimeName.get_name(@runtime_name).to_s + ' ' + 'Ruby command type: ' + CommandType.get_name(@command_type).to_s + ' ' + 'with parameters: ' + @payload.to_s
+    'Runtime Library: ' + RuntimeNameHandler.get_name(@runtime_name) + ' ' + 'Ruby command type: ' + CommandType.get_name(@command_type).to_s + ' ' + 'with parameters: ' + @payload.to_s
   end
 
   def eql?(other)

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

@@ -8,34 +8,4 @@ module RuntimeName
   RUBY = 6
   NODEJS = 7
   CPP = 8
-
-  def self.get_name(runtime_number)
-    if runtime_number == 0
-      return 'CLR'
-    end
-    if runtime_number == 1
-      return 'GO'
-    end
-    if runtime_number == 2
-      return 'JVM'
-    end
-    if runtime_number == 3
-      return 'NETCORE'
-    end
-    if runtime_number == 4
-      return 'PERL'
-    end
-    if runtime_number == 5
-      return 'PYTHON'
-    end
-    if runtime_number == 6
-      return 'RUBY'
-    end
-    if runtime_number == 7
-      return 'NODEJS'
-    end
-    if runtime_number == 8
-      return 'CPP'
-    end
-  end
 end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+require_relative './runtime_name'
+
+class RuntimeNameHandler
+  def self.get_name(runtime_name)
+    if runtime_name == RuntimeName::CLR
+      return 'clr'
+    end
+    if runtime_name == RuntimeName::GO
+      return 'go'
+    end
+    if runtime_name == RuntimeName::JVM
+      return 'jvm'
+    end
+    if runtime_name == RuntimeName::NETCORE
+      return 'netcore'
+    end
+    if runtime_name == RuntimeName::PERL
+      return 'perl'
+    end
+    if runtime_name == RuntimeName::PYTHON
+      return 'python'
+    end
+    if runtime_name == RuntimeName::RUBY
+      return 'ruby'
+    end
+    if runtime_name == RuntimeName::NODEJS
+      return 'nodejs'
+    end
+    if runtime_name == RuntimeName::CPP
+      return 'cpp'
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+class TcpConnectionData
+  attr_reader :ip_address, :port
+
+  def initialize(hostname, port)
+    @port = port
+    if hostname == "localhost"
+      @ip_address = "127.0.0.1"
+    else
+      begin
+        @ip_address = IPSocket.getaddress(hostname)
+      rescue SocketError
+        raise "Unable to resolve hostname to an IP address."
+      end
+    end
+  end
+
+  def ==(other)
+    other.is_a?(TcpConnectionData) && @ip_address == other.ip_address && @port == other.port
+  end
+
+  def to_s
+    "#{@ip_address}:#{@port}"
+
+  end
+
+  def get_address_bytes
+    @ip_address.split(".").map(&:to_i)
+  end
+
+  def get_port_bytes
+    [@port & 0xFF, @port >> 8]
+  end
+end

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

@@ -3,11 +3,11 @@ require_relative '../protocol/command_deserializer'
 require_relative '../handler/handler'
 
 class Interpreter
-  def execute(command, connection_type, tcp_address)
+  def execute(command, connection_type, tcp_connection_data)
 
     command_serializer = CommandSerializer.new
-    message_byte_array = command_serializer.serialize(command, connection_type, tcp_address)
-    if command.runtime_name == RuntimeName::RUBY
+    message_byte_array = command_serializer.serialize(command, connection_type, tcp_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)
     else
@@ -16,8 +16,7 @@ class Interpreter
     end
 
     command_deserializer = CommandDeserializer.new(response_byte_array,response_byte_array.length)
-    encoded_response = command_deserializer.deserialize
-    return encoded_response
+    command_deserializer.deserialize
   end
 
   def process(byte_array, byte_array_len)
@@ -25,6 +24,6 @@ class Interpreter
     received_command = command_deserializer.deserialize
     handler = Handler.new
     command_serializer = CommandSerializer.new
-    return command_serializer.serialize(handler.handle_command(received_command), 0, "0.0.0.0:0")
+    command_serializer.serialize(handler.handle_command(received_command))
   end
 end