javonet-ruby-sdk 2.4.5 → 2.4.7

data/lib/javonet-ruby-sdk/Binaries/Python/{Linux/X64/javonet/core/handler/CommandHandler → Windows/X64/javonet/core/handler}/InvokeInstanceMethodHandler.py

@@ -1,31 +1,31 @@
-from javonet.core.handler.CommandHandler.AbstractCommandHandler import *
-
-
-class InvokeInstanceMethodHandler(AbstractCommandHandler):
-
-    def __init__(self):
-        self._required_parameters_count = 2
-
-    def process(self, command):
-        try:
-            if len(command.payload) < self._required_parameters_count:
-                raise Exception("InvokeInstanceMethod Parameters mismatch!")
-
-            clazz = command.payload[0]
-            try:
-                method = getattr(clazz, command.payload[1])
-            except AttributeError:
-                methods = [method for method in dir(clazz) if callable(getattr(clazz, method))]
-                message = "Method {} not found in class {}. Available methods:\n".format(command.payload[1], clazz.__name__)
-                for method in methods:
-                    message += "{}\n".format(method)
-                raise AttributeError(message)
-            
-            if len(command.payload) > 2:
-                method_arguments = command.payload[2:]
-                return method(*method_arguments)
-            return method()
-        except Exception as e:
-            exc_type, exc_value = type(e), e
-            new_exc = exc_type(exc_value).with_traceback(e.__traceback__)
-            raise new_exc from None
+from javonet.core.handler.AbstractCommandHandler import *
+
+
+class InvokeInstanceMethodHandler(AbstractCommandHandler):
+
+    def __init__(self):
+        self._required_parameters_count = 2
+
+    def process(self, command):
+        try:
+            if len(command.payload) < self._required_parameters_count:
+                raise Exception("InvokeInstanceMethod Parameters mismatch!")
+
+            class_instance = command.payload[0]
+            try:
+                method = getattr(class_instance, command.payload[1])
+            except AttributeError:
+                methods = [method for method in dir(class_instance) if callable(getattr(class_instance, method))]
+                message = "Method {} not found in class {}. Available methods:\n".format(command.payload[1], class_instance.__class__.__name__)
+                for method in methods:
+                    message += "{}\n".format(method)
+                raise AttributeError(message)
+            
+            if len(command.payload) > 2:
+                method_arguments = command.payload[2:]
+                return method(*method_arguments)
+            return method()
+        except Exception as e:
+            exc_type, exc_value = type(e), e
+            new_exc = exc_type(exc_value).with_traceback(e.__traceback__)
+            raise new_exc from None

data/lib/javonet-ruby-sdk/Binaries/Python/Windows/X64/javonet/core/handler/{CommandHandler/InvokeStaticMethodHandler.py → InvokeStaticMethodHandler.py}

@@ -1,6 +1,6 @@
 import traceback
 
-from javonet.core.handler.CommandHandler.AbstractCommandHandler import *
+from javonet.core.handler.AbstractCommandHandler import *
 
 
 class InvokeStaticMethodHandler(AbstractCommandHandler):

data/lib/javonet-ruby-sdk/Binaries/Python/Windows/X64/javonet/core/handler/{CommandHandler/LoadLibraryHandler.py → LoadLibraryHandler.py}

@@ -1,4 +1,4 @@
-from javonet.core.handler.CommandHandler.AbstractCommandHandler import *
+from javonet.core.handler.AbstractCommandHandler import *
 import sys
 import os
 

data/lib/javonet-ruby-sdk/Binaries/Python/Windows/X64/javonet/core/handler/{CommandHandler/ResolveInstanceHandler.py → ResolveInstanceHandler.py}

@@ -1,5 +1,5 @@
-from javonet.core.handler.CommandHandler.AbstractCommandHandler import *
-from javonet.core.handler.ReferencesCache import ReferencesCache
+from javonet.core.handler.AbstractCommandHandler import *
+from javonet.core.referenceCache.ReferencesCache import ReferencesCache
 
 
 class ResolveInstanceHandler(AbstractCommandHandler):

data/lib/javonet-ruby-sdk/Binaries/Python/Windows/X64/javonet/core/handler/{CommandHandler/SetInstanceFieldHandler.py → SetInstanceFieldHandler.py}

@@ -1,4 +1,4 @@
-from javonet.core.handler.CommandHandler.AbstractCommandHandler import *
+from javonet.core.handler.AbstractCommandHandler import *
 
 
 class SetInstanceFieldHandler(AbstractCommandHandler):

data/lib/javonet-ruby-sdk/Binaries/Python/Windows/X64/javonet/core/handler/{CommandHandler/SetStaticFieldHandler.py → SetStaticFieldHandler.py}

@@ -1,4 +1,4 @@
-from javonet.core.handler.CommandHandler.AbstractCommandHandler import *
+from javonet.core.handler.AbstractCommandHandler import *
 
 
 class SetStaticFieldHandler(AbstractCommandHandler):

data/lib/javonet-ruby-sdk/Binaries/Python/Windows/X64/javonet/core/handler/{CommandHandler/ValueHandler.py → ValueHandler.py}

@@ -1,4 +1,4 @@
-from javonet.core.handler.CommandHandler.AbstractCommandHandler import AbstractCommandHandler
+from javonet.core.handler.AbstractCommandHandler import AbstractCommandHandler
 
 
 class ValueHandler(AbstractCommandHandler):

data/lib/javonet-ruby-sdk/Binaries/Python/Windows/X64/javonet/core/namespaceCache/NamespaceCache.py

@@ -0,0 +1,44 @@
+import re
+import types
+import threading
+
+
+class NamespaceCache(object):
+    _instance = None
+    namespace_cache = list()
+    _lock = threading.Lock()
+
+    def __new__(cls):
+        if cls._instance is None:
+            with cls._lock:
+                if cls._instance is None:
+                    cls._instance = super(NamespaceCache, cls).__new__(cls)
+        return cls._instance
+
+    def cache_namespace(self, namespace_regex):
+        with self._lock:
+            self.namespace_cache.append(namespace_regex)
+
+    def is_namespace_cache_empty(self):
+        with self._lock:
+            return len(self.namespace_cache) == 0
+
+    def is_type_allowed(self, type_to_check):
+        with self._lock:
+            for pattern in self.namespace_cache:
+                if isinstance(type_to_check, types.ModuleType):
+                    if re.match(pattern, type_to_check.__name__):
+                        return True
+                else:
+                    if re.match(pattern, type_to_check.__module__):
+                        return True
+        return False
+
+    def get_cached_namespaces(self):
+        with self._lock:
+            return self.namespace_cache[:]
+
+    def clear_cache(self):
+        with self._lock:
+            self.namespace_cache.clear()
+            return 0

data/lib/javonet-ruby-sdk/Binaries/Python/Windows/X64/javonet/core/protocol/CommandSerializer.py

@@ -65,9 +65,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)

data/lib/javonet-ruby-sdk/Binaries/Python/Windows/X64/javonet/core/receiver/Receiver.py

@@ -10,4 +10,7 @@ class Receiver:
         return bytearray(self.python_interpreter.process(messageByteArray, len(messageByteArray)))
 
     def HeartBeat(self, messageByteArray, messageByteArrayLen):
-        return bytearray([49, 48])
+        response_byte_array = bytearray(2)
+        response_byte_array[0] = messageByteArray[11]
+        response_byte_array[1] = messageByteArray[12] - 2
+        return response_byte_array

data/lib/javonet-ruby-sdk/Binaries/Python/Windows/X64/javonet/core/referenceCache/ReferencesCache.py

@@ -0,0 +1,38 @@
+import uuid
+import threading
+from javonet.utils.CommandType import CommandType
+
+class ReferencesCache(object):
+    _instance = None
+    references_cache = dict()
+    _lock = threading.Lock()  # Initialize a lock object
+
+    def __new__(cls):
+        with cls._lock:
+            if cls._instance is None:
+                cls._instance = super(ReferencesCache, cls).__new__(cls)
+        return cls._instance
+
+    def cache_reference(self, object_reference):
+        with self._lock:
+            uuid_ = str(uuid.uuid4())
+            self.references_cache[uuid_] = object_reference
+            return uuid_
+
+    def resolve_reference(self, command):
+        if command.command_type != CommandType.Reference:
+            raise Exception(
+                "Trying to dereference Python command with command_type: " + str(command.command_type))
+        with self._lock:
+            try:
+                return self.references_cache[command.payload[0]]
+            except KeyError:
+                raise Exception("Object not found in references")
+
+    def delete_reference(self, reference_guid):
+        with self._lock:
+            try:
+                del self.references_cache[reference_guid]
+                return 0
+            except KeyError:
+                raise Exception("Object not found in references")

data/lib/javonet-ruby-sdk/Binaries/Python/Windows/X64/javonet/core/typeCache/TypeCache.py

@@ -0,0 +1,44 @@
+import re
+import types
+import threading
+
+
+class TypeCache(object):
+    _instance = None
+    type_cache = list()
+    _lock = threading.Lock()
+
+    def __new__(cls):
+        if cls._instance is None:
+            with cls._lock:
+                if cls._instance is None:
+                    cls._instance = super(TypeCache, cls).__new__(cls)
+        return cls._instance
+
+    def cache_type(self, type_regex):
+        with self._lock:
+            self.type_cache.append(type_regex)
+
+    def is_type_cache_empty(self):
+        with self._lock:
+            return len(self.type_cache) == 0
+
+    def is_type_allowed(self, type_to_check):
+        with self._lock:
+            if isinstance(type_to_check, types.ModuleType):
+                name_to_check = type_to_check.__name__
+            else:
+                name_to_check = ".".join([type_to_check.__module__, type_to_check.__name__])
+            for pattern in self.type_cache:
+                if re.match(pattern, name_to_check):
+                    return True
+        return False
+
+    def get_cached_types(self):
+        with self._lock:
+            return self.type_cache[:]
+
+    def clear_cache(self):
+        with self._lock:
+            self.type_cache.clear()
+            return 0

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

@@ -36,3 +36,5 @@ class CommandType(Enum):
     AsRef = 31
     AsOut = 32
     GetRefValue = 33
+    EnableNamespace = 34
+    EnableType = 35

data/lib/javonet-ruby-sdk/Binaries/Ruby/Linux/X64/core/handler/{command_handler/abstract_command_handler.rb → abstract_command_handler.rb}

@@ -1,4 +1,4 @@
-require_relative '../handler_dictionary'
+require_relative 'handler_dictionary'
 
 class AbstractCommandHandler
 

data/lib/javonet-ruby-sdk/Binaries/Ruby/{MacOs/X64/core/handler/command_handler → Linux/X64/core/handler}/destruct_reference_handler.rb

@@ -1,5 +1,5 @@
 require_relative 'abstract_command_handler'
-require_relative '../../../core/handler/references_cache'
+require_relative '../reference_cache/references_cache'
 
 class DestructReferenceHandler < AbstractCommandHandler
   def initialize

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

@@ -0,0 +1,31 @@
+require_relative 'abstract_command_handler'
+require_relative '../namespace_cache/namespace_cache'
+
+class EnableNamespaceHandler < AbstractCommandHandler
+  def initialize
+    @required_parameters_count = 1
+  end
+
+  def process(command)
+    begin
+      if command.payload.length < @required_parameters_count
+        raise ArgumentError.new "#{self.class.name} parameters mismatch"
+      end
+      namespace_cache = NamespaceCache.instance
+
+      command.payload.each do |payload|
+        if payload.is_a? String
+          namespace_cache.cache_namespace(payload)
+        elsif payload.is_a? Array
+          payload.each do |type_to_enable|
+            namespace_cache.cache_namespace(type_to_enable)
+            cache_namespace
+          end
+        end
+      end
+      0
+    rescue Exception => e
+      return e
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+require_relative 'abstract_command_handler'
+require_relative '../type_cache/type_cache'
+
+class EnableTypeHandler < AbstractCommandHandler
+  def initialize
+    @required_parameters_count = 1
+  end
+
+  def process(command)
+    begin
+      if command.payload.length < @required_parameters_count
+        raise "#{self.class.name} parameters mismatch!"
+      end
+
+      type_cache = TypeCache.instance
+
+      command.payload.each do |payload|
+        if payload.is_a? String
+          type_cache.cache_type(payload)
+        elsif payload.is_a? Array
+          payload.each do |type_to_enable|
+            type_cache.cache_type(type_to_enable)
+          end
+        end
+
+      end
+      0
+    end
+  rescue Exception => e
+    return e
+  end
+end

data/lib/javonet-ruby-sdk/Binaries/Ruby/{MacOs/X64/core/handler/command_handler → Linux/X64/core/handler}/get_instance_field_handler.rb

@@ -6,7 +6,7 @@ class GetInstanceFieldHandler < AbstractCommandHandler
   end
 
   def process(command)
-    return get_instance_field(command)
+    get_instance_field(command)
   end
 
   def get_instance_field(command)

data/lib/javonet-ruby-sdk/Binaries/Ruby/{MacOs/X64/core/handler/command_handler → Linux/X64/core/handler}/get_static_field_handler.rb

@@ -6,7 +6,7 @@ class GetStaticFieldHandler < AbstractCommandHandler
   end
 
   def process(command)
-    return get_static_field(command)
+    get_static_field(command)
   end
 
   def get_static_field(command)

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

@@ -0,0 +1,59 @@
+require_relative 'abstract_command_handler'
+require_relative '../namespace_cache/namespace_cache'
+require_relative '../type_cache/type_cache'
+
+class GetTypeHandler < AbstractCommandHandler
+  def initialize
+    @required_parameters_count = 1
+    @namespace_cache = NamespaceCache.instance
+    @type_cache = TypeCache.instance
+  end
+
+  def process(command)
+    begin
+      if command.payload.length < @required_parameters_count
+        raise "#{self.class.name} parameters mismatch!"
+      end
+
+      type_to_return = _get_type_from_payload(command)
+
+      if type_to_return.nil?
+        raise "Type #{command.payload[0]} not found"
+      end
+
+      if (@namespace_cache.is_namespace_cache_empty? && @type_cache.is_type_cache_empty?) || # both caches are empty
+        @namespace_cache.is_type_allowed(type_to_return) || # namespace is allowed
+        @type_cache.is_type_allowed(type_to_return)
+        # continue - type is allowed
+      else
+        allowed_namespaces = @namespace_cache.get_cached_namespaces.join(", ")
+        allowed_types = @type_cache.get_cached_types.join(", ")
+        raise "Type #{type_to_return.name} not allowed. \nAllowed namespaces: #{allowed_namespaces}\nAllowed types: #{allowed_types}"
+      end
+
+      type_to_return
+    rescue Exception => e
+      return e
+    end
+end
+
+    private
+
+    def _get_type_from_payload(command)
+      if command.payload.length == 1
+        type_name = command.payload[0].split("::")
+        if type_name.length == 1
+          return Object::const_get(type_name[0])
+        else
+          return _get_type_from_nested_payload(type_name)
+        end
+      else
+        return _get_type_from_nested_payload(command.payload)
+      end
+    end
+
+    def _get_type_from_nested_payload(payload)
+      loaded_module = Object::const_get(payload[0..-2].join("::"))
+      loaded_module.const_get(payload[-1])
+    end
+  end