javonet-nodejs-sdk 2.1.0 → 2.1.1

package/Binaries/Python/Windows/X64/javonet/core/exception/ExceptionThrower.py

@@ -1,5 +1,7 @@
 import re
+import sys
 import traceback
+import types
 
 from javonet.core.exception.JavonetException import JavonetException
 from javonet.utils.ExceptionType import ExceptionType
@@ -15,33 +17,23 @@ class ExceptionThrower:
         exception_name = command_exception.get_payload()[2]
         exception_message = command_exception.get_payload()[3]
 
-        stack_trace = []
-        if len(command_exception.get_payload()) > 7:
-            stack_classes, stack_methods, stack_lines, stack_files = ExceptionThrower.get_local_stack_trace(command_exception.get_payload()[4],
+        stack_classes, stack_methods, stack_lines, stack_files = ExceptionThrower.get_local_stack_trace(command_exception.get_payload()[4],
                                                 command_exception.get_payload()[5],
                                                 command_exception.get_payload()[6],
                                                 command_exception.get_payload()[7])
-        else:
-            stack_trace = []
         traceback_str = ""
-        traceback_list = []
 
         for i in range(len(stack_methods) - 1):
             traceback_str += "File \"{}\", line {}, in {}\n".format(stack_files[i], stack_lines[i], stack_methods[i])
             if stack_classes[i]:
                 traceback_str += "    {}\n".format(stack_classes[i])
-            if stack_lines[i] == '':
-                stack_lines[i] = 0
-            traceback_list.append(traceback.FrameSummary(stack_files[i], int(stack_lines[i]), stack_methods[i]))
-            
-        exception = JavonetException(exception_name, exception_message, traceback_str )
-        ExceptionThrower.throw_javonet_exception(original_exception, exception)
+
+        ExceptionThrower.raise_exception(original_exception,exception_message,traceback_str)
 
 
     @staticmethod
-    def throw_javonet_exception(original_exception, exception):
-        traceback.print_exception(type(exception), exception, exception.__traceback__)
-        raise original_exception
+    def raise_exception(original_exception, exception_message, traceback_str):
+        raise JavonetException(str(original_exception), exception_message, traceback_str)
 
     @staticmethod
     def get_local_stack_trace(stack_trace_classes, stack_trace_methods, stack_trace_lines, stack_trace_files):

package/Binaries/Python/Windows/X64/javonet/core/handler/CommandHandler/AbstractCommandHandler.py

@@ -9,18 +9,12 @@ class AbstractCommandHandler:
         pass
 
     def handle_command(self, command):
-        try:
-            self.__iterate(command)
-            return self.process(command)
-        except Exception as e:
-            raise e
+        self.__iterate(command)
+        return self.process(command)
 
     @staticmethod
     def __iterate(command):
         for i in range(0, len(command.payload)):
             if isinstance(command.payload[i], Command):
-                try:
-                    command.payload[i] = handler_dict.get(command.payload[i].command_type).handle_command(
+                command.payload[i] = handler_dict.get(command.payload[i].command_type).handle_command(
                         command.payload[i])
-                except Exception as e:
-                    raise e

package/Binaries/Python/Windows/X64/javonet/core/handler/CommandHandler/ArrayGetItemHandler.py

@@ -21,4 +21,6 @@ class ArrayGetItemHandler(AbstractCommandHandler):
                 return array_copy
 
         except Exception as e:
-            raise Exception(e) from e
+            exc_type, exc_value = type(e), e
+            new_exc = exc_type(exc_value).with_traceback(e.__traceback__)
+            raise new_exc from None

package/Binaries/Python/Windows/X64/javonet/core/handler/CommandHandler/ArrayGetRankHandler.py

@@ -17,4 +17,6 @@ class ArrayGetRankHandler(AbstractCommandHandler):
             #return np_array.ndim
 
         except Exception as e:
-            raise Exception(e) from e
+            exc_type, exc_value = type(e), e
+            new_exc = exc_type(exc_value).with_traceback(e.__traceback__)
+            raise new_exc from None

package/Binaries/Python/Windows/X64/javonet/core/handler/CommandHandler/ArrayGetSizeHandler.py

@@ -15,4 +15,6 @@ class ArrayGetSizeHandler(AbstractCommandHandler):
             #return np_array.size
 
         except Exception as e:
-            raise Exception(e) from e
+            exc_type, exc_value = type(e), e
+            new_exc = exc_type(exc_value).with_traceback(e.__traceback__)
+            raise new_exc from None

package/Binaries/Python/Windows/X64/javonet/core/handler/CommandHandler/ArraySetItemHandler.py

@@ -18,4 +18,6 @@ class ArraySetItemHandler(AbstractCommandHandler):
                 return 0
 
         except Exception as e:
-            raise Exception(e) from e
+            exc_type, exc_value = type(e), e
+            new_exc = exc_type(exc_value).with_traceback(e.__traceback__)
+            raise new_exc from None

package/Binaries/Python/Windows/X64/javonet/core/handler/CommandHandler/CreateClassInstanceHandler.py

@@ -21,4 +21,6 @@ class CreateClassInstanceHandler(AbstractCommandHandler):
                 return clazz(*method_arguments)
             return clazz()
         except Exception as e:
-            raise Exception(e) from e
+            exc_type, exc_value = type(e), e
+            new_exc = exc_type(exc_value).with_traceback(e.__traceback__)
+            raise new_exc from None

package/Binaries/Python/Windows/X64/javonet/core/handler/CommandHandler/GetInstanceFieldHandler.py

@@ -14,5 +14,7 @@ class GetInstanceFieldHandler(AbstractCommandHandler):
             value = getattr(clazz, command.payload[1])
             return value
         except Exception as e:
-            raise Exception(e) from e
+            exc_type, exc_value = type(e), e
+            new_exc = exc_type(exc_value).with_traceback(e.__traceback__)
+            raise new_exc from None
 

package/Binaries/Python/Windows/X64/javonet/core/handler/CommandHandler/GetStaticFieldHandler.py

@@ -14,4 +14,6 @@ class GetStaticFieldHandler(AbstractCommandHandler):
             value = getattr(clazz, command.payload[1])
             return value
         except Exception as e:
-            raise Exception(e) from e
+            exc_type, exc_value = type(e), e
+            new_exc = exc_type(exc_value).with_traceback(e.__traceback__)
+            raise new_exc from None

package/Binaries/Python/Windows/X64/javonet/core/handler/CommandHandler/GetTypeHandler.py

@@ -21,4 +21,6 @@ class GetTypeHandler(AbstractCommandHandler):
             else:
                 return import_module(".".join(command.payload[:]))
         except Exception as e:
-            raise Exception(e) from e
+            exc_type, exc_value = type(e), e
+            new_exc = exc_type(exc_value).with_traceback(e.__traceback__)
+            raise new_exc from None

package/Binaries/Python/Windows/X64/javonet/core/handler/CommandHandler/InvokeInstanceMethodHandler.py

@@ -19,4 +19,6 @@ class InvokeInstanceMethodHandler(AbstractCommandHandler):
                 return method(*method_arguments)
             return method()
         except Exception as e:
-            raise Exception(e) from e
+            exc_type, exc_value = type(e), e
+            new_exc = exc_type(exc_value).with_traceback(e.__traceback__)
+            raise new_exc from None

package/Binaries/Python/Windows/X64/javonet/core/handler/CommandHandler/InvokeStaticMethodHandler.py

@@ -1,3 +1,5 @@
+import traceback
+
 from javonet.core.handler.CommandHandler.AbstractCommandHandler import *
 
 
@@ -19,4 +21,8 @@ class InvokeStaticMethodHandler(AbstractCommandHandler):
                 return method(*method_arguments)
             return method()
         except Exception as e:
-            raise Exception(e) from e
+            exc_type, exc_value = type(e), e
+            new_exc = exc_type(exc_value).with_traceback(e.__traceback__)
+            raise new_exc from None
+
+

package/Binaries/Python/Windows/X64/javonet/core/handler/CommandHandler/LoadLibraryHandler.py

@@ -17,4 +17,6 @@ class LoadLibraryHandler(AbstractCommandHandler):
 
             return 0
         except Exception as e:
-            raise Exception(e) from e
+            exc_type, exc_value = type(e), e
+            new_exc = exc_type(exc_value).with_traceback(e.__traceback__)
+            raise new_exc from None

package/Binaries/Python/Windows/X64/javonet/core/handler/CommandHandler/ResolveInstanceHandler.py

@@ -14,4 +14,6 @@ class ResolveInstanceHandler(AbstractCommandHandler):
             references_cache = ReferencesCache()
             return references_cache.resolve_reference(command)
         except Exception as e:
-            raise Exception(e) from e
+            exc_type, exc_value = type(e), e
+            new_exc = exc_type(exc_value).with_traceback(e.__traceback__)
+            raise new_exc from None

package/Binaries/Python/Windows/X64/javonet/core/handler/CommandHandler/SetStaticFieldHandler.py

@@ -15,4 +15,6 @@ class SetStaticFieldHandler(AbstractCommandHandler):
             setattr(clazz, command.payload[1], command.payload[2])
             return "SetStaticFieldHandler - success"
         except Exception as e:
-            raise Exception(e) from e
+            exc_type, exc_value = type(e), e
+            new_exc = exc_type(exc_value).with_traceback(e.__traceback__)
+            raise new_exc from None

package/Binaries/Python/Windows/X64/javonet/core/handler/Handler.py

@@ -67,8 +67,8 @@ class Handler(AbstractHandler):
             response = handler_dict.get(command.command_type).handle_command(command)
             return self.__parse_response(response, command.runtime_name)
         except Exception as e:
-            stack_trace = traceback.extract_stack()
-            return ExceptionSerializer.serialize_exception(e, command, stack_trace)
+
+            return ExceptionSerializer.serialize_exception(e, command)
 
     def __parse_response(self, response, runtime_name):
         if self.__is_response_simple_type(response):

package/Binaries/Python/Windows/X64/javonet/core/transmitter/PythonTransmitterWrapper.py

@@ -35,8 +35,16 @@ class PythonTransmitterWrapper:
             PythonTransmitterWrapper.python_lib.ReadResponse(response_ubyte_array.from_buffer(response),
                                                              response_array_len)
             return response
+        elif response_array_len == 0:
+            error_message = "Response is empty"
+            raise RuntimeError(error_message)
         else:
-            raise RuntimeError("Javonet native code error: " + str(response_array_len))
+            get_native_error = PythonTransmitterWrapper.python_lib.GetNativeError
+            get_native_error.restype = c_char_p
+            get_native_error.argtypes = []
+            error_message = get_native_error()
+            raise RuntimeError(
+                "Javonet native error code: " + str(response_array_len) + ". " + str(error_message))
 
     @staticmethod
     def activate(email, licence_key, proxy_host, proxy_user_name, proxy_user_password):
@@ -44,8 +52,19 @@ class PythonTransmitterWrapper:
         activate.restype = c_int
         activate.argtypes = [c_char_p, c_char_p, c_char_p, c_char_p, c_char_p]
 
-        return activate(email.encode('ascii'),
-                        licence_key.encode('ascii'),
-                        proxy_host.encode('ascii'),
-                        proxy_user_name.encode('ascii'),
-                        proxy_user_password.encode('ascii'))
+        activation_result = activate(email.encode('ascii'),
+                                     licence_key.encode('ascii'),
+                                     proxy_host.encode('ascii'),
+                                     proxy_user_name.encode('ascii'),
+                                     proxy_user_password.encode('ascii'))
+
+        if activation_result < 0:
+            get_native_error = PythonTransmitterWrapper.python_lib.GetNativeError
+            get_native_error.restype = c_char_p
+            get_native_error.argtypes = []
+            error_message = get_native_error()
+            raise RuntimeError(
+                "Javonet activation result: " + str(activation_result) + ". Native error message: " + str(error_message))
+        else:
+            return activation_result
+        

package/Binaries/Ruby/Linux/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/Linux/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/Linux/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/Linux/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/Linux/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/Linux/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/Linux/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/Linux/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/Linux/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/Linux/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/Linux/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