javonet-nodejs-sdk 2.1.0 → 2.1.1

package/Binaries/Ruby/Linux/X64/core/handler/command_handler/get_type_handler.rb

@@ -4,6 +4,7 @@ class GetTypeHandler < AbstractCommandHandler
   def initialize
     @required_parameters_count = 1
   end
+
   def process(command)
     begin
       if command.payload.length < @required_parameters_count

package/Binaries/Ruby/Linux/X64/core/handler/command_handler/invoke_instance_method_handler.rb

@@ -1,25 +1,25 @@
 require_relative 'abstract_command_handler'
 
-
 class InvokeInstanceMethodHandler < AbstractCommandHandler
   def initialize
     @required_parameters_count = 2
   end
+
   def process(command)
     return invoke_instance_method(command)
   end
 
   def invoke_instance_method(command)
     begin
-    if command.payload.length < @required_parameters_count
-      raise "InvokeInstanceMethod parameters mismatch"
-    end
-    if command.payload.length > 2
-      arguments = command.payload[2..]
-      return command.payload[0].send(command.payload[1], *arguments)
-    else
-      return command.payload[0].send(command.payload[1])
-    end
+      if command.payload.length < @required_parameters_count
+        raise "InvokeInstanceMethod parameters mismatch"
+      end
+      if command.payload.length > 2
+        arguments = command.payload[2..]
+        return command.payload[0].send(command.payload[1], *arguments)
+      else
+        return command.payload[0].send(command.payload[1])
+      end
     rescue Exception => e
       return e
     end

package/Binaries/Ruby/Linux/X64/core/handler/command_handler/invoke_static_method_handler.rb

@@ -4,21 +4,22 @@ class InvokeStaticMethodHandler < AbstractCommandHandler
   def initialize
     @required_parameters_count = 2
   end
+
   def process(command)
     invoke_static_method(command)
   end
 
   def invoke_static_method(command)
     begin
-    if command.payload.length < @required_parameters_count
-      raise "Static method parameters mismatch"
-    end
-    if command.payload.length > @required_parameters_count
-      args = command.payload[2..]
-      command.payload[0].send(command.payload[1],*args)
-    else
-      command.payload[0].send(command.payload[1])
-    end
+      if command.payload.length < @required_parameters_count
+        raise "Static method parameters mismatch"
+      end
+      if command.payload.length > @required_parameters_count
+        args = command.payload[2..]
+        command.payload[0].send(command.payload[1], *args)
+      else
+        command.payload[0].send(command.payload[1])
+      end
     rescue Exception => e
       return e
     end

package/Binaries/Ruby/Linux/X64/core/handler/command_handler/load_library_handler.rb

@@ -18,7 +18,6 @@ class LoadLibraryHandler < AbstractCommandHandler
       #noinspection RubyResolve
       require(assembly_name)
       return 0
-
     rescue Exception => e
       return e
     end

package/Binaries/Ruby/Linux/X64/core/handler/command_handler/resolve_instance_handler.rb

@@ -5,6 +5,7 @@ class ResolveInstanceHandler < AbstractCommandHandler
   def initialize
     @required_parameters_count = 1
   end
+
   def process(command)
     return resolve_reference(command)
   end

package/Binaries/Ruby/Linux/X64/core/handler/command_handler/set_static_field_handler.rb

@@ -1,6 +1,6 @@
 require_relative 'abstract_command_handler'
 
-class  SetStaticFieldHandler < AbstractCommandHandler
+class SetStaticFieldHandler < AbstractCommandHandler
   def initialize
     @required_parameters_count = 3
   end
@@ -11,12 +11,12 @@ class  SetStaticFieldHandler < AbstractCommandHandler
 
   def set_static_field(command)
     begin
-    if command.payload.length != @required_parameters_count
-      raise "Set static field parameters mismatch"
-    end
+      if command.payload.length != @required_parameters_count
+        raise "Set static field parameters mismatch"
+      end
 
-    merged_value = '@@' + command.payload[1]
-    command.payload[0].class_variable_set(merged_value, command.payload[2])
+      merged_value = '@@' + command.payload[1]
+      command.payload[0].class_variable_set(merged_value, command.payload[2])
     rescue Exception => e
       return e
     end

package/Binaries/Ruby/Linux/X64/core/transmitter/transmitter.rb

@@ -4,17 +4,25 @@ require_relative 'transmitter_wrapper'
 
 class Transmitter
 
-  def self.send_command(messageArray, messageArrayLen)
-    message = FFI::MemoryPointer.new(:uchar, messageArrayLen, true)
-    message.put_array_of_uchar(0, messageArray)
-    responseArrayLen = TransmitterWrapper.SendCommand(message, messageArrayLen)
-    if responseArrayLen >0
-      response = FFI::MemoryPointer.new(:uchar, responseArrayLen, true)
-      TransmitterWrapper.ReadResponse(response, responseArrayLen)
-      responseArray = response.get_array_of_uchar(0, responseArrayLen)
-      return responseArray
+  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)
+    response_byte_array_len = TransmitterWrapper.SendCommand(message, message_byte_array_len)
+    if response_byte_array_len > 0
+      response = FFI::MemoryPointer.new(:uchar, response_byte_array_len, true)
+      TransmitterWrapper.ReadResponse(response, response_byte_array_len)
+      response_byte_array = response.get_array_of_uchar(0, response_byte_array_len)
+      return response_byte_array
+    elsif response_byte_array_len == 0
+      error_message = "Response is empty"
+      raise Exception.new error_message
     else
-      raise Exception.new "Javonet native error code: " + responseArrayLen.to_s
+      error_message = get_native_error
+      raise Exception.new "Javonet native error code: " + response_byte_array_len.to_s + ". " + error_message
     end
   end
 
@@ -30,8 +38,14 @@ class Transmitter
     return activate(email, licenceKey, proxyHost, proxyUserName, proxyPassword)
   end
 
-  private_class_method def self.activate(email="", licenceKey="", proxyHost="", proxyUserName="", proxyUserPassword="")
-    return TransmitterWrapper.Activate(email, licenceKey, proxyHost, proxyUserName, proxyUserPassword)
+  private_class_method def self.activate(email = "", licenceKey = "", proxyHost = "", proxyUserName = "", proxyUserPassword = "")
+    activation_result = TransmitterWrapper.Activate(email, licenceKey, proxyHost, proxyUserName, proxyUserPassword)
+    if activation_result < 0
+      error_message = get_native_error
+      raise Exception.new "Javonet activation result: " + activation_result.to_s + ". " + error_message
+    else
+      return activation_result
+    end
   end
 
 end

package/Binaries/Ruby/Linux/X64/core/transmitter/transmitter_wrapper.rb

@@ -1,15 +1,16 @@
 module TransmitterWrapper
   extend FFI::Library
-    if OS.linux?
-      ffi_lib File.expand_path('../../../Binaries/Native/Linux/X64/libJavonetRubyRuntimeNative.so', __FILE__)
-    elsif OS.mac?
-      ffi_lib File.expand_path('../../../Binaries/Native/MacOs/X64/libJavonetRubyRuntimeNative.dylib', __FILE__)
-    else
-      RubyInstaller::Runtime.add_dll_directory(File.expand_path('../../../Binaries/Native/Windows/X64/', __FILE__))
-      ffi_lib File.expand_path('../../../Binaries/Native/Windows/X64/JavonetRubyRuntimeNative.dll', __FILE__ )
-    end
-    attach_function :SendCommand, [:pointer, :int], :int
-    attach_function :ReadResponse, [:pointer, :int], :int
-    attach_function :Activate, [:pointer, :pointer, :pointer, :pointer, :pointer], :int
+  if OS.linux?
+    ffi_lib File.expand_path('../../../Binaries/Native/Linux/X64/libJavonetRubyRuntimeNative.so', __FILE__)
+  elsif OS.mac?
+    ffi_lib File.expand_path('../../../Binaries/Native/MacOs/X64/libJavonetRubyRuntimeNative.dylib', __FILE__)
+  else
+    RubyInstaller::Runtime.add_dll_directory(File.expand_path('../../../Binaries/Native/Windows/X64/', __FILE__))
+    ffi_lib File.expand_path('../../../Binaries/Native/Windows/X64/JavonetRubyRuntimeNative.dll', __FILE__)
+  end
+  attach_function :SendCommand, [:pointer, :int], :int
+  attach_function :ReadResponse, [:pointer, :int], :int
+  attach_function :Activate, [:pointer, :pointer, :pointer, :pointer, :pointer], :int
+  attach_function :GetNativeError, [], :string
 
 end

package/Binaries/Ruby/MacOs/X64/core/exceptions/exception_serializer.rb

@@ -15,19 +15,18 @@ class ExceptionSerializer
     stack_files = ""
     stack_trace.each_with_index do |value, index|
       stack_file, stack_class, stack_line, stack_method = parse_stack_frame(value)
-      append_to_string(stack_classes, stack_class)
-      append_to_string(stack_methods, stack_method)
-      append_to_string(stack_lines, stack_line)
-      append_to_string(stack_files, stack_file)
-
-      if index != stack_trace.length() - 1
-        append_to_string(stack_classes, "|")
-        append_to_string(stack_methods, "|")
-        append_to_string(stack_lines, "|")
-        append_to_string(stack_files, "|")
+      if !stack_file.include?("javonet-ruby-sdk")
+        append_to_string(stack_classes, stack_class)
+        append_to_string(stack_methods, stack_method)
+        append_to_string(stack_lines, stack_line)
+        append_to_string(stack_files, stack_file)
+        if index != stack_trace.length() - 1
+          append_to_string(stack_classes, "|")
+          append_to_string(stack_methods, "|")
+          append_to_string(stack_lines, "|")
+          append_to_string(stack_files, "|")
+        end
       end
-
-
     end
 
     exception_command = exception_command.add_arg_to_payload(get_exception_code(exception_name.to_s))
@@ -59,7 +58,8 @@ class ExceptionSerializer
 
     # Extract the class name and method name
     method_name = match[3]
-    class_name = nil
+    file_name = File.basename(match[1], ".rb")
+    class_name = file_name.split('_').map(&:capitalize).join('')
     if method_name =~ /(.+)#(.+)/
       class_name = $1.split('::')[-1]
       method_name = $2

package/Binaries/Ruby/MacOs/X64/core/handler/command_handler/abstract_command_handler.rb

@@ -5,17 +5,18 @@ class AbstractCommandHandler
   @required_parameters_count = 0
 
   def handle_command(command)
-      iterate(command)
-      return process(command)
+    iterate(command)
+    return process(command)
   end
 
   def iterate(command)
-      (0..command.payload.length).step(1) do |i|
-        if command.payload[i].is_a? Command
-            command.payload[i] = $handler_dict[command.payload[i].command_type].handle_command(command.payload[i])
-        end
+    (0..command.payload.length).step(1) do |i|
+      if command.payload[i].is_a? Command
+        command.payload[i] = $handler_dict[command.payload[i].command_type].handle_command(command.payload[i])
       end
+    end
   end
+
   def process(command)
     raise 'process is not implemented'
   end

package/Binaries/Ruby/MacOs/X64/core/handler/command_handler/array_get_item_handler.rb

@@ -2,8 +2,12 @@ require_relative 'abstract_command_handler'
 
 class ArrayGetItemHandler < AbstractCommandHandler
   def process(command)
-    array = command.payload[0]
-    index = command.payload[1,]
-    return array[index]
+    begin
+      array = command.payload[0]
+      index = command.payload[1,]
+      return array[index]
+    rescue Exception => e
+      return e
+    end
   end
 end

package/Binaries/Ruby/MacOs/X64/core/handler/command_handler/array_get_rank_handler.rb

@@ -2,6 +2,10 @@ require_relative 'abstract_command_handler'
 
 class ArrayGetRankHandler < AbstractCommandHandler
   def process(command)
-    raise "ArrayGetRankHandler not implemented"
+    begin
+      raise "ArrayGetRankHandler not implemented"
+    rescue Exception => e
+      return e
+    end
   end
 end

package/Binaries/Ruby/MacOs/X64/core/handler/command_handler/array_get_size_handler.rb

@@ -2,7 +2,11 @@ require_relative 'abstract_command_handler'
 
 class ArrayGetSizeHandler < AbstractCommandHandler
   def process(command)
-    array = command.payload[0]
-    return array.length()
+    begin
+      array = command.payload[0]
+      return array.length()
+    rescue Exception => e
+      return e
+    end
   end
 end

package/Binaries/Ruby/MacOs/X64/core/handler/command_handler/array_set_item_handler.rb

@@ -2,10 +2,14 @@ require_relative 'abstract_command_handler'
 
 class ArraySetItemHandler < AbstractCommandHandler
   def process(command)
-    array = command.payload[0]
-    value = command.payload[1]
-    index = command.payload[2,]
-    array[index] = value
-    return 0
+    begin
+      array = command.payload[0]
+      value = command.payload[1]
+      index = command.payload[2,]
+      array[index] = value
+      return 0
+    rescue Exception => e
+      return e
+    end
   end
 end

package/Binaries/Ruby/MacOs/X64/core/handler/command_handler/casting_handler.rb

@@ -2,6 +2,10 @@ require_relative 'abstract_command_handler'
 
 class CastingHandler < AbstractCommandHandler
   def process(command)
-    raise "Explicit cast is forbidden in dynamically typed languages"
+    begin
+      raise "Explicit cast is forbidden in dynamically typed languages"
+    rescue Exception => e
+      return e
+    end
   end
 end

package/Binaries/Ruby/MacOs/X64/core/handler/command_handler/create_class_instance_handler.rb

@@ -11,19 +11,19 @@ class CreateClassInstanceHandler < AbstractCommandHandler
 
   def create_class_instance(command)
     begin
-    if command.payload.length < @required_parameters_count
-      raise "Class instance parameters mismatch"
+      if command.payload.length < @required_parameters_count
+        raise "Class instance parameters mismatch"
+      end
+      if command.payload.length > 1
+        constructor_arguments = command.payload[1..]
+        class_instance = command.payload[0].send('new', *constructor_arguments)
+      else
+        class_instance = command.payload[0].send('new')
+      end
+      return class_instance
+    rescue Exception => e
+      return e
     end
-    if command.payload.length > 1
-      constructor_arguments = command.payload[1..]
-      class_instance = command.payload[0].send('new', *constructor_arguments)
-    else
-      class_instance = command.payload[0].send('new')
-    end
-    return class_instance
-  rescue Exception => e
-    return e
-  end
   end
 
 end

package/Binaries/Ruby/MacOs/X64/core/handler/command_handler/destruct_reference_handler.rb

@@ -5,6 +5,7 @@ class DestructReferenceHandler < AbstractCommandHandler
   def initialize
     @required_parameters_count = 1
   end
+
   def process(command)
     begin
       if command.payload.length == @required_parameters_count

package/Binaries/Ruby/MacOs/X64/core/handler/command_handler/get_instance_field_handler.rb

@@ -11,16 +11,16 @@ class GetInstanceFieldHandler < AbstractCommandHandler
 
   def get_instance_field(command)
     begin
-    if command.payload.length != @required_parameters_count
-      raise "Instance field parameters mismatch"
-    end
-    merged_value = '@' + command.payload[1]
-    if command.payload[0].instance_variable_defined?(merged_value)
-      response = command.payload[0].instance_variable_get(merged_value)
-    else
-      raise "Instance field not defined"
-    end
-    return response
+      if command.payload.length != @required_parameters_count
+        raise "Instance field parameters mismatch"
+      end
+      merged_value = '@' + command.payload[1]
+      if command.payload[0].instance_variable_defined?(merged_value)
+        response = command.payload[0].instance_variable_get(merged_value)
+      else
+        raise "Instance field not defined"
+      end
+      return response
     rescue Exception => e
       return e
     end

package/Binaries/Ruby/MacOs/X64/core/handler/command_handler/get_static_field_handler.rb

@@ -11,17 +11,17 @@ class GetStaticFieldHandler < AbstractCommandHandler
 
   def get_static_field(command)
     begin
-    if command.payload.length != @required_parameters_count
-      raise "Static field parameters mismatch"
-    end
+      if command.payload.length != @required_parameters_count
+        raise "Static field parameters mismatch"
+      end
 
-    merged_value = '@@' + command.payload[1]
-    if command.payload[0].class_variable_defined?(merged_value)
-      response = command.payload[0].class_variable_get(merged_value)
-    else
-      response = command.payload[0].const_get(command.payload[1])
-    end
-    return response
+      merged_value = '@@' + command.payload[1]
+      if command.payload[0].class_variable_defined?(merged_value)
+        response = command.payload[0].class_variable_get(merged_value)
+      else
+        response = command.payload[0].const_get(command.payload[1])
+      end
+      return response
     rescue Exception => e
       return e
     end

package/Binaries/Ruby/MacOs/X64/core/handler/command_handler/get_type_handler.rb

@@ -4,6 +4,7 @@ class GetTypeHandler < AbstractCommandHandler
   def initialize
     @required_parameters_count = 1
   end
+
   def process(command)
     begin
       if command.payload.length < @required_parameters_count

package/Binaries/Ruby/MacOs/X64/core/handler/command_handler/invoke_instance_method_handler.rb

@@ -1,25 +1,25 @@
 require_relative 'abstract_command_handler'
 
-
 class InvokeInstanceMethodHandler < AbstractCommandHandler
   def initialize
     @required_parameters_count = 2
   end
+
   def process(command)
     return invoke_instance_method(command)
   end
 
   def invoke_instance_method(command)
     begin
-    if command.payload.length < @required_parameters_count
-      raise "InvokeInstanceMethod parameters mismatch"
-    end
-    if command.payload.length > 2
-      arguments = command.payload[2..]
-      return command.payload[0].send(command.payload[1], *arguments)
-    else
-      return command.payload[0].send(command.payload[1])
-    end
+      if command.payload.length < @required_parameters_count
+        raise "InvokeInstanceMethod parameters mismatch"
+      end
+      if command.payload.length > 2
+        arguments = command.payload[2..]
+        return command.payload[0].send(command.payload[1], *arguments)
+      else
+        return command.payload[0].send(command.payload[1])
+      end
     rescue Exception => e
       return e
     end

package/Binaries/Ruby/MacOs/X64/core/handler/command_handler/invoke_static_method_handler.rb

@@ -4,21 +4,22 @@ class InvokeStaticMethodHandler < AbstractCommandHandler
   def initialize
     @required_parameters_count = 2
   end
+
   def process(command)
     invoke_static_method(command)
   end
 
   def invoke_static_method(command)
     begin
-    if command.payload.length < @required_parameters_count
-      raise "Static method parameters mismatch"
-    end
-    if command.payload.length > @required_parameters_count
-      args = command.payload[2..]
-      command.payload[0].send(command.payload[1],*args)
-    else
-      command.payload[0].send(command.payload[1])
-    end
+      if command.payload.length < @required_parameters_count
+        raise "Static method parameters mismatch"
+      end
+      if command.payload.length > @required_parameters_count
+        args = command.payload[2..]
+        command.payload[0].send(command.payload[1], *args)
+      else
+        command.payload[0].send(command.payload[1])
+      end
     rescue Exception => e
       return e
     end

package/Binaries/Ruby/MacOs/X64/core/handler/command_handler/load_library_handler.rb

@@ -18,7 +18,6 @@ class LoadLibraryHandler < AbstractCommandHandler
       #noinspection RubyResolve
       require(assembly_name)
       return 0
-
     rescue Exception => e
       return e
     end

package/Binaries/Ruby/MacOs/X64/core/handler/command_handler/resolve_instance_handler.rb

@@ -5,6 +5,7 @@ class ResolveInstanceHandler < AbstractCommandHandler
   def initialize
     @required_parameters_count = 1
   end
+
   def process(command)
     return resolve_reference(command)
   end

package/Binaries/Ruby/MacOs/X64/core/handler/command_handler/set_static_field_handler.rb

@@ -1,6 +1,6 @@
 require_relative 'abstract_command_handler'
 
-class  SetStaticFieldHandler < AbstractCommandHandler
+class SetStaticFieldHandler < AbstractCommandHandler
   def initialize
     @required_parameters_count = 3
   end
@@ -11,12 +11,12 @@ class  SetStaticFieldHandler < AbstractCommandHandler
 
   def set_static_field(command)
     begin
-    if command.payload.length != @required_parameters_count
-      raise "Set static field parameters mismatch"
-    end
+      if command.payload.length != @required_parameters_count
+        raise "Set static field parameters mismatch"
+      end
 
-    merged_value = '@@' + command.payload[1]
-    command.payload[0].class_variable_set(merged_value, command.payload[2])
+      merged_value = '@@' + command.payload[1]
+      command.payload[0].class_variable_set(merged_value, command.payload[2])
     rescue Exception => e
       return e
     end

package/Binaries/Ruby/MacOs/X64/core/transmitter/transmitter.rb

@@ -4,17 +4,25 @@ require_relative 'transmitter_wrapper'
 
 class Transmitter
 
-  def self.send_command(messageArray, messageArrayLen)
-    message = FFI::MemoryPointer.new(:uchar, messageArrayLen, true)
-    message.put_array_of_uchar(0, messageArray)
-    responseArrayLen = TransmitterWrapper.SendCommand(message, messageArrayLen)
-    if responseArrayLen >0
-      response = FFI::MemoryPointer.new(:uchar, responseArrayLen, true)
-      TransmitterWrapper.ReadResponse(response, responseArrayLen)
-      responseArray = response.get_array_of_uchar(0, responseArrayLen)
-      return responseArray
+  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)
+    response_byte_array_len = TransmitterWrapper.SendCommand(message, message_byte_array_len)
+    if response_byte_array_len > 0
+      response = FFI::MemoryPointer.new(:uchar, response_byte_array_len, true)
+      TransmitterWrapper.ReadResponse(response, response_byte_array_len)
+      response_byte_array = response.get_array_of_uchar(0, response_byte_array_len)
+      return response_byte_array
+    elsif response_byte_array_len == 0
+      error_message = "Response is empty"
+      raise Exception.new error_message
     else
-      raise Exception.new "Javonet native error code: " + responseArrayLen.to_s
+      error_message = get_native_error
+      raise Exception.new "Javonet native error code: " + response_byte_array_len.to_s + ". " + error_message
     end
   end
 
@@ -30,8 +38,14 @@ class Transmitter
     return activate(email, licenceKey, proxyHost, proxyUserName, proxyPassword)
   end
 
-  private_class_method def self.activate(email="", licenceKey="", proxyHost="", proxyUserName="", proxyUserPassword="")
-    return TransmitterWrapper.Activate(email, licenceKey, proxyHost, proxyUserName, proxyUserPassword)
+  private_class_method def self.activate(email = "", licenceKey = "", proxyHost = "", proxyUserName = "", proxyUserPassword = "")
+    activation_result = TransmitterWrapper.Activate(email, licenceKey, proxyHost, proxyUserName, proxyUserPassword)
+    if activation_result < 0
+      error_message = get_native_error
+      raise Exception.new "Javonet activation result: " + activation_result.to_s + ". " + error_message
+    else
+      return activation_result
+    end
   end
 
 end