javonet-nodejs-sdk 2.4.6 → 2.4.8

package/Binaries/Python/MacOs/X64/javonet/core/protocol/CommandDeserializer.py

@@ -45,6 +45,7 @@ class CommandDeserializer:
             Type.JavonetDouble: self.read_double,
             Type.JavonetUnsignedLongLong: self.read_ullong,
             Type.JavonetUnsignedInteger: self.read_uint,
+            Type.JavonetNoneType: self.read_none
         }
         return switch.get(type_value, lambda: Exception("Type not supported"))()
 
@@ -136,4 +137,11 @@ class CommandDeserializer:
         p = self.position
         self.position += size
         return TypeDeserializer.deserialize_uint(self.buffer[p:p + size])
+
+    def read_none(self):
+        size = 1
+        self.position += 2
+        p = self.position
+        self.position += size
+        return TypeDeserializer.deserialize_none(self.buffer[p:p + size])
     

package/Binaries/Python/MacOs/X64/javonet/core/protocol/CommandSerializer.py

@@ -33,9 +33,10 @@ class CommandSerializer:
 
     @staticmethod
     def serialize_primitive(payload_item):
+        if payload_item is None:
+            return TypeSerializer.serialize_none()
         if isinstance(payload_item, bool):
             return TypeSerializer.serialize_bool(payload_item)
-
         elif isinstance(payload_item, int):
             if payload_item in range(-2 ** 31, 2 ** 31):
                 return TypeSerializer.serialize_int(payload_item)
@@ -43,10 +44,8 @@ class CommandSerializer:
                 return TypeSerializer.serialize_longlong(payload_item)
             else:
                 return TypeSerializer.serialize_ullong(payload_item)
-
         elif isinstance(payload_item, float):
             return TypeSerializer.serialize_double(payload_item)
-
         elif isinstance(payload_item, str):
             return TypeSerializer.serialize_string(payload_item)
         else:
@@ -65,9 +64,6 @@ class CommandSerializer:
                 inner_command = command.get_payload()[0]
                 self.insert_into_buffer(TypeSerializer.serialize_command(inner_command))
                 queue.append(inner_command)
-            elif isinstance(command.get_payload()[0], Exception):
-                result = self.serialize_primitive(str(command.get_payload()[0]))
-                self.insert_into_buffer(result)
             else:
                 result = self.serialize_primitive(command.get_payload()[0])
                 self.insert_into_buffer(result)

package/Binaries/Python/MacOs/X64/javonet/core/protocol/TypeDeserializer.py

@@ -58,3 +58,7 @@ class TypeDeserializer:
     @staticmethod
     def deserialize_uint(encoded_unsigned_int):
         return struct.unpack("<I", bytearray(encoded_unsigned_int))[0]
+
+    @staticmethod
+    def deserialize_none(encoded_none):
+        return None

package/Binaries/Python/MacOs/X64/javonet/core/protocol/TypeSerializer.py

@@ -70,3 +70,7 @@ class TypeSerializer:
         encoded_unsigned_int_list = list(bytearray(struct.pack("<I", unsigned_int_value)))
         length = len(encoded_unsigned_int_list)
         return [Type.JavonetUnsignedInteger.value, length] + encoded_unsigned_int_list
+
+    @staticmethod
+    def serialize_none():
+        return [Type.JavonetNoneType.value, 1, 0]

package/Binaries/Python/MacOs/X64/javonet/utils/CommandType.py

@@ -38,3 +38,4 @@ class CommandType(Enum):
     GetRefValue = 33
     EnableNamespace = 34
     EnableType = 35
+    CreateNull = 36

package/Binaries/Python/MacOs/X64/javonet/utils/exception/ExceptionThrower.py

@@ -55,9 +55,23 @@ class ExceptionThrower:
 
     @staticmethod
     def get_local_stack_trace(stack_trace_classes, stack_trace_methods, stack_trace_lines, stack_trace_files):
-        stack_classes = re.split("\\|", stack_trace_classes)
-        stack_methods = re.split("\\|", stack_trace_methods)
-        stack_lines = re.split("\\|", stack_trace_lines)
-        stack_files = re.split("\\|", stack_trace_files)
+        try:
+            stack_classes = re.split("\\|", stack_trace_classes)
+        except Exception:
+            stack_classes = ""
 
+        try:
+            stack_methods = re.split("\\|", stack_trace_methods)
+        except Exception:
+            stack_methods = ""
+
+        try:
+            stack_lines = re.split("\\|", stack_trace_lines)
+        except Exception:
+            stack_lines = ""
+
+        try:
+            stack_files = re.split("\\|", stack_trace_files)
+        except Exception:
+            stack_files = ""
         return [stack_classes, stack_methods, stack_lines, stack_files]

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

@@ -69,7 +69,7 @@ class Handler(AbstractHandler):
             return ExceptionSerializer.serialize_exception(e, command)
 
     def __parse_response(self, response, runtime_name):
-        if self.__is_response_simple_type(response):
+        if self.__is_response_simple_type(response) or self.__is_response_null(response):
             return Command.create_response(response, runtime_name)
         else:
             reference_cache = ReferencesCache()
@@ -80,6 +80,10 @@ class Handler(AbstractHandler):
     def __is_response_simple_type(response):
         return isinstance(response, (int, float, bool, str))
 
+    @staticmethod
+    def __is_response_null(response):
+        return response is None
+
     @staticmethod
     def __is_response_array(response):
         return isinstance(response, list);

package/Binaries/Python/Windows/X64/javonet/core/protocol/CommandDeserializer.py

@@ -45,6 +45,7 @@ class CommandDeserializer:
             Type.JavonetDouble: self.read_double,
             Type.JavonetUnsignedLongLong: self.read_ullong,
             Type.JavonetUnsignedInteger: self.read_uint,
+            Type.JavonetNoneType: self.read_none
         }
         return switch.get(type_value, lambda: Exception("Type not supported"))()
 
@@ -136,4 +137,11 @@ class CommandDeserializer:
         p = self.position
         self.position += size
         return TypeDeserializer.deserialize_uint(self.buffer[p:p + size])
+
+    def read_none(self):
+        size = 1
+        self.position += 2
+        p = self.position
+        self.position += size
+        return TypeDeserializer.deserialize_none(self.buffer[p:p + size])
     

package/Binaries/Python/Windows/X64/javonet/core/protocol/CommandSerializer.py

@@ -33,9 +33,10 @@ class CommandSerializer:
 
     @staticmethod
     def serialize_primitive(payload_item):
+        if payload_item is None:
+            return TypeSerializer.serialize_none()
         if isinstance(payload_item, bool):
             return TypeSerializer.serialize_bool(payload_item)
-
         elif isinstance(payload_item, int):
             if payload_item in range(-2 ** 31, 2 ** 31):
                 return TypeSerializer.serialize_int(payload_item)
@@ -43,10 +44,8 @@ class CommandSerializer:
                 return TypeSerializer.serialize_longlong(payload_item)
             else:
                 return TypeSerializer.serialize_ullong(payload_item)
-
         elif isinstance(payload_item, float):
             return TypeSerializer.serialize_double(payload_item)
-
         elif isinstance(payload_item, str):
             return TypeSerializer.serialize_string(payload_item)
         else:
@@ -65,9 +64,6 @@ class CommandSerializer:
                 inner_command = command.get_payload()[0]
                 self.insert_into_buffer(TypeSerializer.serialize_command(inner_command))
                 queue.append(inner_command)
-            elif isinstance(command.get_payload()[0], Exception):
-                result = self.serialize_primitive(str(command.get_payload()[0]))
-                self.insert_into_buffer(result)
             else:
                 result = self.serialize_primitive(command.get_payload()[0])
                 self.insert_into_buffer(result)

package/Binaries/Python/Windows/X64/javonet/core/protocol/TypeDeserializer.py

@@ -58,3 +58,7 @@ class TypeDeserializer:
     @staticmethod
     def deserialize_uint(encoded_unsigned_int):
         return struct.unpack("<I", bytearray(encoded_unsigned_int))[0]
+
+    @staticmethod
+    def deserialize_none(encoded_none):
+        return None

package/Binaries/Python/Windows/X64/javonet/core/protocol/TypeSerializer.py

@@ -70,3 +70,7 @@ class TypeSerializer:
         encoded_unsigned_int_list = list(bytearray(struct.pack("<I", unsigned_int_value)))
         length = len(encoded_unsigned_int_list)
         return [Type.JavonetUnsignedInteger.value, length] + encoded_unsigned_int_list
+
+    @staticmethod
+    def serialize_none():
+        return [Type.JavonetNoneType.value, 1, 0]

package/Binaries/Python/Windows/X64/javonet/utils/CommandType.py

@@ -38,3 +38,4 @@ class CommandType(Enum):
     GetRefValue = 33
     EnableNamespace = 34
     EnableType = 35
+    CreateNull = 36

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

@@ -55,9 +55,23 @@ class ExceptionThrower:
 
     @staticmethod
     def get_local_stack_trace(stack_trace_classes, stack_trace_methods, stack_trace_lines, stack_trace_files):
-        stack_classes = re.split("\\|", stack_trace_classes)
-        stack_methods = re.split("\\|", stack_trace_methods)
-        stack_lines = re.split("\\|", stack_trace_lines)
-        stack_files = re.split("\\|", stack_trace_files)
+        try:
+            stack_classes = re.split("\\|", stack_trace_classes)
+        except Exception:
+            stack_classes = ""
 
+        try:
+            stack_methods = re.split("\\|", stack_trace_methods)
+        except Exception:
+            stack_methods = ""
+
+        try:
+            stack_lines = re.split("\\|", stack_trace_lines)
+        except Exception:
+            stack_lines = ""
+
+        try:
+            stack_files = re.split("\\|", stack_trace_files)
+        except Exception:
+            stack_files = ""
         return [stack_classes, stack_methods, stack_lines, stack_files]

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

@@ -23,7 +23,7 @@ require_relative '../../core/handler/array_handler'
 require_relative '../../core/handler/enable_namespace_handler'
 require_relative '../../core/handler/enable_type_handler'
 require_relative '../../core/reference_cache/references_cache'
-require_relative '../../core/exceptions/exception_serializer'
+require_relative '../../utils/exceptions/exception_serializer'
 
 
 class Handler < AbstractHandler
@@ -81,7 +81,7 @@ class Handler < AbstractHandler
       return Command.create_array_response(response_array, command.runtime_name)
     end
     response = $handler_dict[command.command_type].handle_command(command)
-      if is_response_simple_type(response)
+      if is_response_nil(response) || is_response_simple_type(response)
         Command.create_response(response, command.runtime_name)
       elsif response.is_a? Exception
         return ExceptionSerializer.serialize_exception(response, command)
@@ -96,6 +96,10 @@ class Handler < AbstractHandler
     (response.is_a? String or response.is_a? Float or response.is_a? Integer or response.is_a? TrueClass or response.is_a? FalseClass)
   end
 
+  def is_response_nil(response)
+    response.nil?
+  end
+
   def is_response_array(response)
     response.is_a? Array
   end

package/Binaries/Ruby/Linux/X64/core/protocol/command_deserializer.rb

@@ -52,6 +52,8 @@ class CommandDeserializer
       return self.read_ullong
     when Type::JAVONET_UNSIGNED_INTEGER
       return self.read_uint
+    when Type::JAVONET_NULL
+      return self.read_nil
     else
       raise Exception.new("Type #{type_num} not supported in command deserializer")
     end
@@ -158,4 +160,12 @@ class CommandDeserializer
     @position += size
     TypeDeserializer.deserialize_uint(@buffer[p..p + size - 1])
   end
+
+  def read_nil
+    size = 1
+    @position += 2
+    p = @position
+    @position += size
+    TypeDeserializer.deserialize_nil(@buffer[p..p + size])
+  end
 end

package/Binaries/Ruby/Linux/X64/core/protocol/command_serializer.rb

@@ -27,8 +27,10 @@ class CommandSerializer
   end
 
   def serialize_primitive(payload_item)
-    if [true, false].include? payload_item
-      TypeSerializer.serialize_bool(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)
@@ -38,9 +40,9 @@ class CommandSerializer
         return TypeSerializer.serialize_ullong(payload_item)
       end
     elsif payload_item.is_a? String
-      TypeSerializer.serialize_string(payload_item)
+      return TypeSerializer.serialize_string(payload_item)
     elsif payload_item.is_a? Float
-      TypeSerializer.serialize_double(payload_item)
+      return TypeSerializer.serialize_double(payload_item)
     elsif payload_item.is_a?
     else
       raise Exception.new("Payload not supported in command serializer")

package/Binaries/Ruby/Linux/X64/core/protocol/type_deserializer.rb

@@ -58,4 +58,8 @@ class TypeDeserializer
     encoded_uint.map(&:chr).join.unpack('I').first
   end
 
+  def self.deserialize_nil(encoded_nil)
+    nil
+  end
+
 end

package/Binaries/Ruby/Linux/X64/core/protocol/type_serializer.rb

@@ -68,4 +68,8 @@ class TypeSerializer
     return [Type::JAVONET_UNSIGNED_LONG_LONG, length] + encoded_ullong_list
   end
 
+  def self.serialize_nil
+    return [Type::JAVONET_NULL, 1, 0]
+  end
+
 end

package/Binaries/Ruby/Linux/X64/utils/command_type.rb

@@ -35,6 +35,7 @@ class CommandType
   GET_REF_VALUE = 33
   ENABLE_NAMESPACE = 34
   ENABLE_TYPE = 35
+  CREATE_NULL = 36
 
   def self.get_name(command_number)
     case command_number
@@ -110,6 +111,8 @@ class CommandType
       return 'ENABLE_NAMESPACE'
     when 35
       return 'ENABLE_TYPE'
+    when 36
+      return 'CREATE_NULL'
     else
       raise 'Unknown command type'
     end

package/Binaries/Ruby/{MacOs/X64/core → Linux/X64/utils}/exceptions/exception_serializer.rb

@@ -1,4 +1,4 @@
-require_relative '../exceptions/exception_type'
+require_relative './exception_type'
 
 class ExceptionSerializer
 

package/Binaries/Ruby/Linux/X64/{core → utils}/exceptions/exception_thrower.rb

@@ -1,4 +1,4 @@
-require_relative '../exceptions/exception_type'
+require_relative './exception_type'
 
 class ExceptionThrower
 

package/Binaries/Ruby/Linux/X64/utils/type.rb

@@ -10,4 +10,5 @@ class Type
   JAVONET_DOUBLE = 8
   JAVONET_UNSIGNED_LONG_LONG = 9
   JAVONET_UNSIGNED_INTEGER = 10
+  JAVONET_NULL = 11
 end

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

@@ -23,7 +23,7 @@ require_relative '../../core/handler/array_handler'
 require_relative '../../core/handler/enable_namespace_handler'
 require_relative '../../core/handler/enable_type_handler'
 require_relative '../../core/reference_cache/references_cache'
-require_relative '../../core/exceptions/exception_serializer'
+require_relative '../../utils/exceptions/exception_serializer'
 
 
 class Handler < AbstractHandler
@@ -81,7 +81,7 @@ class Handler < AbstractHandler
       return Command.create_array_response(response_array, command.runtime_name)
     end
     response = $handler_dict[command.command_type].handle_command(command)
-      if is_response_simple_type(response)
+      if is_response_nil(response) || is_response_simple_type(response)
         Command.create_response(response, command.runtime_name)
       elsif response.is_a? Exception
         return ExceptionSerializer.serialize_exception(response, command)
@@ -96,6 +96,10 @@ class Handler < AbstractHandler
     (response.is_a? String or response.is_a? Float or response.is_a? Integer or response.is_a? TrueClass or response.is_a? FalseClass)
   end
 
+  def is_response_nil(response)
+    response.nil?
+  end
+
   def is_response_array(response)
     response.is_a? Array
   end

package/Binaries/Ruby/MacOs/X64/core/protocol/command_deserializer.rb

@@ -52,6 +52,8 @@ class CommandDeserializer
       return self.read_ullong
     when Type::JAVONET_UNSIGNED_INTEGER
       return self.read_uint
+    when Type::JAVONET_NULL
+      return self.read_nil
     else
       raise Exception.new("Type #{type_num} not supported in command deserializer")
     end
@@ -158,4 +160,12 @@ class CommandDeserializer
     @position += size
     TypeDeserializer.deserialize_uint(@buffer[p..p + size - 1])
   end
+
+  def read_nil
+    size = 1
+    @position += 2
+    p = @position
+    @position += size
+    TypeDeserializer.deserialize_nil(@buffer[p..p + size])
+  end
 end

package/Binaries/Ruby/MacOs/X64/core/protocol/command_serializer.rb

@@ -27,8 +27,10 @@ class CommandSerializer
   end
 
   def serialize_primitive(payload_item)
-    if [true, false].include? payload_item
-      TypeSerializer.serialize_bool(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)
@@ -38,9 +40,9 @@ class CommandSerializer
         return TypeSerializer.serialize_ullong(payload_item)
       end
     elsif payload_item.is_a? String
-      TypeSerializer.serialize_string(payload_item)
+      return TypeSerializer.serialize_string(payload_item)
     elsif payload_item.is_a? Float
-      TypeSerializer.serialize_double(payload_item)
+      return TypeSerializer.serialize_double(payload_item)
     elsif payload_item.is_a?
     else
       raise Exception.new("Payload not supported in command serializer")

package/Binaries/Ruby/MacOs/X64/core/protocol/type_deserializer.rb

@@ -58,4 +58,8 @@ class TypeDeserializer
     encoded_uint.map(&:chr).join.unpack('I').first
   end
 
+  def self.deserialize_nil(encoded_nil)
+    nil
+  end
+
 end

package/Binaries/Ruby/MacOs/X64/core/protocol/type_serializer.rb

@@ -68,4 +68,8 @@ class TypeSerializer
     return [Type::JAVONET_UNSIGNED_LONG_LONG, length] + encoded_ullong_list
   end
 
+  def self.serialize_nil
+    return [Type::JAVONET_NULL, 1, 0]
+  end
+
 end