javonet-ruby-sdk 2.3.0 → 2.4.1

data/lib/javonet-ruby-sdk/Binaries/Python/MacOs/X64/javonet/core/interpreter/Interpreter.py

@@ -1,21 +1,23 @@
 from javonet.core.handler.Handler import Handler
 from javonet.core.protocol.CommandDeserializer import CommandDeserializer
 from javonet.core.protocol.CommandSerializer import CommandSerializer
+from javonet.utils.ConnectionType import ConnectionType
 from javonet.utils.RuntimeName import RuntimeName
+from javonet.utils.TcpConnectionData import TcpConnectionData
 
 
 class Interpreter:
     response = None
 
-    def execute(self, command, connection_type, tcp_address):
+    def execute(self, command, connection_type, tcp_connection_data: TcpConnectionData):
         command_serializer = CommandSerializer()
-        serialized_command = command_serializer.serialize(command, connection_type, tcp_address)
-        if command.runtime_name == RuntimeName.python:
+        serialized_command = command_serializer.serialize(command, connection_type, tcp_connection_data)
+        if (command.runtime_name == RuntimeName.python) & (connection_type == ConnectionType.InMemory):
             from javonet.core.receiver.Receiver import Receiver
             response = Receiver().SendCommand(serialized_command, len(serialized_command))
         else:
-            from javonet.core.transmitter.PythonTransmitter import PythonTransmitter
-            response = PythonTransmitter.send_command(serialized_command)
+            from javonet.core.transmitter.Transmitter import Transmitter
+            response = Transmitter.send_command(serialized_command)
         command_deserializer = CommandDeserializer(response, len(response))
 
         return command_deserializer.deserialize()

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

@@ -6,37 +6,30 @@ from javonet.core.protocol.TypeSerializer import TypeSerializer
 from javonet.utils.Command import Command
 from javonet.utils.ConnectionType import ConnectionType
 from javonet.utils.RuntimeName import RuntimeName
+from javonet.utils.TcpConnectionData import TcpConnectionData
 
 
 class CommandSerializer:
     byte_buffer = []
 
-    def serialize(self, root_command, connection_type, tcp_address=None, runtime_version=0):
+    def serialize(self, root_command, connection_type, tcp_connection_data: TcpConnectionData, runtime_version=0):
         queue: Deque[Command] = deque()
         queue.append(root_command)
         self.insert_into_buffer([root_command.runtime_name.value, runtime_version])
         if connection_type == ConnectionType.Tcp.value:
             self.insert_into_buffer([ConnectionType.Tcp.value])
-            self.insert_into_buffer(self.serialize_tcp(tcp_address))
+            self.insert_into_buffer(self.serialize_tcp(tcp_connection_data))
         else:
             self.insert_into_buffer([ConnectionType.InMemory.value])
-            self.insert_into_buffer(self.serialize_tcp("0.0.0.0:0"))
+            self.insert_into_buffer([0, 0, 0, 0, 0, 0])
         self.insert_into_buffer([RuntimeName.python.value, root_command.command_type.value])
         return self.serialize_recursively(queue)
 
     @staticmethod
-    def serialize_tcp(tcp_address):
-        if isinstance(tcp_address, list):
-            return 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 = []
-            for address in tcp_address_ip:
-                tcp_address_bytearray += [int(address)]
-            tcp_address_bytearray += list(bytearray(struct.pack("<h", int(tcp_address_port))))
-            return tcp_address_bytearray
+    def serialize_tcp(tcp_connection_data):
+        if tcp_connection_data is None:
+            raise Exception("tcp_connection_data is not provided")
+        return tcp_connection_data.get_address_bytes() + tcp_connection_data.get_pot_bytes()
 
     @staticmethod
     def serialize_primitive(payload_item):

data/lib/javonet-ruby-sdk/Binaries/Python/MacOs/X64/javonet/core/transmitter/Transmitter.py

@@ -0,0 +1,28 @@
+from javonet.core.transmitter.TransmitterWrapper import TransmitterWrapper
+
+
+class Transmitter:
+
+    @staticmethod
+    def send_command(message):
+        return TransmitterWrapper.send_command(message)
+
+    @staticmethod
+    def __activate(license_key="", proxy_host="", proxy_user_name="", proxy_user_password=""):
+        return TransmitterWrapper.activate(license_key, proxy_host, proxy_user_name, proxy_user_password)
+
+    @staticmethod
+    def activate_with_license_file():
+        return Transmitter.__activate()
+
+    @staticmethod
+    def activate_with_credentials(license_key):
+        return Transmitter.__activate(license_key)
+
+    @staticmethod
+    def activate_with_credentials_and_proxy(license_key, proxy_host, proxy_user_name, proxy_user_password):
+        return Transmitter.__activate(license_key, proxy_host, proxy_user_name, proxy_user_password)
+
+    @staticmethod
+    def set_config_source(source_path):
+        return TransmitterWrapper.set_config_source(source_path)

data/lib/javonet-ruby-sdk/Binaries/Python/{Linux/X64/javonet/core/transmitter/PythonTransmitterWrapper.py → MacOs/X64/javonet/core/transmitter/TransmitterWrapper.py}

@@ -8,7 +8,7 @@ CMPFUNC = CFUNCTYPE(py_object, POINTER(c_ubyte), c_int)
 callbackFunction = CMPFUNC(callbackFunc)
 
 
-class PythonTransmitterWrapper:
+class TransmitterWrapper:
     if platform.system() == 'Windows':
         file_path = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
         python_lib_path = file_path + '\\Binaries\\Native\\Windows\\X64\\JavonetPythonRuntimeNative.dll'
@@ -26,20 +26,20 @@ class PythonTransmitterWrapper:
     def send_command(message):
         message_array = bytearray(message)
         message_ubyte_array = c_ubyte * len(message_array)
-        response_array_len = PythonTransmitterWrapper.python_lib.SendCommand(
+        response_array_len = TransmitterWrapper.python_lib.SendCommand(
             message_ubyte_array.from_buffer(message_array),
             len(message_array))
         if response_array_len > 0:
             response = bytearray(response_array_len)
             response_ubyte_array = c_ubyte * response_array_len
-            PythonTransmitterWrapper.python_lib.ReadResponse(response_ubyte_array.from_buffer(response),
-                                                             response_array_len)
+            TransmitterWrapper.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:
-            get_native_error = PythonTransmitterWrapper.python_lib.GetNativeError
+            get_native_error = TransmitterWrapper.python_lib.GetNativeError
             get_native_error.restype = c_char_p
             get_native_error.argtypes = []
             error_message = get_native_error()
@@ -47,18 +47,18 @@ class PythonTransmitterWrapper:
                 "Javonet native error code: " + str(response_array_len) + ". " + str(error_message))
 
     @staticmethod
-    def activate(licence_key, proxy_host, proxy_user_name, proxy_user_password):
-        activate = PythonTransmitterWrapper.python_lib.Activate
+    def activate(license_key, proxy_host, proxy_user_name, proxy_user_password):
+        activate = TransmitterWrapper.python_lib.Activate
         activate.restype = c_int
         activate.argtypes = [c_char_p, c_char_p, c_char_p, c_char_p]
 
-        activation_result = activate(licence_key.encode('ascii'),
+        activation_result = activate(license_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 = TransmitterWrapper.python_lib.GetNativeError
             get_native_error.restype = c_char_p
             get_native_error.argtypes = []
             error_message = get_native_error()
@@ -66,4 +66,21 @@ class PythonTransmitterWrapper:
                 "Javonet activation result: " + str(activation_result) + ". Native error message: " + str(error_message))
         else:
             return activation_result
-        
+        
+    @staticmethod
+    def set_config_source(sourcePath):
+        set_config_source = TransmitterWrapper.python_lib.SetConfigSource
+        set_config_source.restype = c_int
+        set_config_source.argtypes = [c_char_p]
+
+        set_config_result = set_config_source(sourcePath.encode('ascii'))
+
+        if set_config_result < 0:
+            get_native_error = TransmitterWrapper.python_lib.GetNativeError
+            get_native_error.restype = c_char_p
+            get_native_error.argtypes = []
+            error_message = get_native_error()
+            raise RuntimeError(
+                "Javonet set config source result: " + str(set_config_result) + ". Native error message: " + str(error_message))
+        else:
+            return set_config_result

data/lib/javonet-ruby-sdk/Binaries/Python/MacOs/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/MacOs/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/Python/Windows/X64/javonet/core/interpreter/Interpreter.py

@@ -1,21 +1,23 @@
 from javonet.core.handler.Handler import Handler
 from javonet.core.protocol.CommandDeserializer import CommandDeserializer
 from javonet.core.protocol.CommandSerializer import CommandSerializer
+from javonet.utils.ConnectionType import ConnectionType
 from javonet.utils.RuntimeName import RuntimeName
+from javonet.utils.TcpConnectionData import TcpConnectionData
 
 
 class Interpreter:
     response = None
 
-    def execute(self, command, connection_type, tcp_address):
+    def execute(self, command, connection_type, tcp_connection_data: TcpConnectionData):
         command_serializer = CommandSerializer()
-        serialized_command = command_serializer.serialize(command, connection_type, tcp_address)
-        if command.runtime_name == RuntimeName.python:
+        serialized_command = command_serializer.serialize(command, connection_type, tcp_connection_data)
+        if (command.runtime_name == RuntimeName.python) & (connection_type == ConnectionType.InMemory):
             from javonet.core.receiver.Receiver import Receiver
             response = Receiver().SendCommand(serialized_command, len(serialized_command))
         else:
-            from javonet.core.transmitter.PythonTransmitter import PythonTransmitter
-            response = PythonTransmitter.send_command(serialized_command)
+            from javonet.core.transmitter.Transmitter import Transmitter
+            response = Transmitter.send_command(serialized_command)
         command_deserializer = CommandDeserializer(response, len(response))
 
         return command_deserializer.deserialize()

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

@@ -6,37 +6,30 @@ from javonet.core.protocol.TypeSerializer import TypeSerializer
 from javonet.utils.Command import Command
 from javonet.utils.ConnectionType import ConnectionType
 from javonet.utils.RuntimeName import RuntimeName
+from javonet.utils.TcpConnectionData import TcpConnectionData
 
 
 class CommandSerializer:
     byte_buffer = []
 
-    def serialize(self, root_command, connection_type, tcp_address=None, runtime_version=0):
+    def serialize(self, root_command, connection_type, tcp_connection_data: TcpConnectionData, runtime_version=0):
         queue: Deque[Command] = deque()
         queue.append(root_command)
         self.insert_into_buffer([root_command.runtime_name.value, runtime_version])
         if connection_type == ConnectionType.Tcp.value:
             self.insert_into_buffer([ConnectionType.Tcp.value])
-            self.insert_into_buffer(self.serialize_tcp(tcp_address))
+            self.insert_into_buffer(self.serialize_tcp(tcp_connection_data))
         else:
             self.insert_into_buffer([ConnectionType.InMemory.value])
-            self.insert_into_buffer(self.serialize_tcp("0.0.0.0:0"))
+            self.insert_into_buffer([0, 0, 0, 0, 0, 0])
         self.insert_into_buffer([RuntimeName.python.value, root_command.command_type.value])
         return self.serialize_recursively(queue)
 
     @staticmethod
-    def serialize_tcp(tcp_address):
-        if isinstance(tcp_address, list):
-            return 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 = []
-            for address in tcp_address_ip:
-                tcp_address_bytearray += [int(address)]
-            tcp_address_bytearray += list(bytearray(struct.pack("<h", int(tcp_address_port))))
-            return tcp_address_bytearray
+    def serialize_tcp(tcp_connection_data):
+        if tcp_connection_data is None:
+            raise Exception("tcp_connection_data is not provided")
+        return tcp_connection_data.get_address_bytes() + tcp_connection_data.get_pot_bytes()
 
     @staticmethod
     def serialize_primitive(payload_item):

data/lib/javonet-ruby-sdk/Binaries/Python/Windows/X64/javonet/core/transmitter/Transmitter.py

@@ -0,0 +1,28 @@
+from javonet.core.transmitter.TransmitterWrapper import TransmitterWrapper
+
+
+class Transmitter:
+
+    @staticmethod
+    def send_command(message):
+        return TransmitterWrapper.send_command(message)
+
+    @staticmethod
+    def __activate(license_key="", proxy_host="", proxy_user_name="", proxy_user_password=""):
+        return TransmitterWrapper.activate(license_key, proxy_host, proxy_user_name, proxy_user_password)
+
+    @staticmethod
+    def activate_with_license_file():
+        return Transmitter.__activate()
+
+    @staticmethod
+    def activate_with_credentials(license_key):
+        return Transmitter.__activate(license_key)
+
+    @staticmethod
+    def activate_with_credentials_and_proxy(license_key, proxy_host, proxy_user_name, proxy_user_password):
+        return Transmitter.__activate(license_key, proxy_host, proxy_user_name, proxy_user_password)
+
+    @staticmethod
+    def set_config_source(source_path):
+        return TransmitterWrapper.set_config_source(source_path)

data/lib/javonet-ruby-sdk/Binaries/Python/{MacOs/X64/javonet/core/transmitter/PythonTransmitterWrapper.py → Windows/X64/javonet/core/transmitter/TransmitterWrapper.py}

@@ -1,69 +1,86 @@
-import os
-import platform
-from ctypes import *
-
-from javonet.core.callback.callbackFunc import callbackFunc
-
-CMPFUNC = CFUNCTYPE(py_object, POINTER(c_ubyte), c_int)
-callbackFunction = CMPFUNC(callbackFunc)
-
-
-class PythonTransmitterWrapper:
-    if platform.system() == 'Windows':
-        file_path = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
-        python_lib_path = file_path + '\\Binaries\\Native\\Windows\\X64\\JavonetPythonRuntimeNative.dll'
-    if platform.system() == 'Linux':
-        file_path = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
-        python_lib_path = file_path + '/Binaries/Native/Linux/X64/libJavonetPythonRuntimeNative.so'
-    if platform.system() == 'Darwin':
-        file_path = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
-        python_lib_path = file_path + '/Binaries/Native/MacOs/X64/libJavonetPythonRuntimeNative.dylib'
-
-    python_lib = cdll.LoadLibrary(python_lib_path)
-    python_lib.SetCallback(callbackFunction)
-
-    @staticmethod
-    def send_command(message):
-        message_array = bytearray(message)
-        message_ubyte_array = c_ubyte * len(message_array)
-        response_array_len = PythonTransmitterWrapper.python_lib.SendCommand(
-            message_ubyte_array.from_buffer(message_array),
-            len(message_array))
-        if response_array_len > 0:
-            response = bytearray(response_array_len)
-            response_ubyte_array = c_ubyte * response_array_len
-            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:
-            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(licence_key, proxy_host, proxy_user_name, proxy_user_password):
-        activate = PythonTransmitterWrapper.python_lib.Activate
-        activate.restype = c_int
-        activate.argtypes = [c_char_p, c_char_p, c_char_p, c_char_p]
-
-        activation_result = activate(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
-        
+import os
+import platform
+from ctypes import *
+
+from javonet.core.callback.callbackFunc import callbackFunc
+
+CMPFUNC = CFUNCTYPE(py_object, POINTER(c_ubyte), c_int)
+callbackFunction = CMPFUNC(callbackFunc)
+
+
+class TransmitterWrapper:
+    if platform.system() == 'Windows':
+        file_path = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
+        python_lib_path = file_path + '\\Binaries\\Native\\Windows\\X64\\JavonetPythonRuntimeNative.dll'
+    if platform.system() == 'Linux':
+        file_path = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
+        python_lib_path = file_path + '/Binaries/Native/Linux/X64/libJavonetPythonRuntimeNative.so'
+    if platform.system() == 'Darwin':
+        file_path = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
+        python_lib_path = file_path + '/Binaries/Native/MacOs/X64/libJavonetPythonRuntimeNative.dylib'
+
+    python_lib = cdll.LoadLibrary(python_lib_path)
+    python_lib.SetCallback(callbackFunction)
+
+    @staticmethod
+    def send_command(message):
+        message_array = bytearray(message)
+        message_ubyte_array = c_ubyte * len(message_array)
+        response_array_len = TransmitterWrapper.python_lib.SendCommand(
+            message_ubyte_array.from_buffer(message_array),
+            len(message_array))
+        if response_array_len > 0:
+            response = bytearray(response_array_len)
+            response_ubyte_array = c_ubyte * response_array_len
+            TransmitterWrapper.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:
+            get_native_error = TransmitterWrapper.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(license_key, proxy_host, proxy_user_name, proxy_user_password):
+        activate = TransmitterWrapper.python_lib.Activate
+        activate.restype = c_int
+        activate.argtypes = [c_char_p, c_char_p, c_char_p, c_char_p]
+
+        activation_result = activate(license_key.encode('ascii'),
+                                     proxy_host.encode('ascii'),
+                                     proxy_user_name.encode('ascii'),
+                                     proxy_user_password.encode('ascii'))
+
+        if activation_result < 0:
+            get_native_error = TransmitterWrapper.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
+        
+    @staticmethod
+    def set_config_source(sourcePath):
+        set_config_source = TransmitterWrapper.python_lib.SetConfigSource
+        set_config_source.restype = c_int
+        set_config_source.argtypes = [c_char_p]
+
+        set_config_result = set_config_source(sourcePath.encode('ascii'))
+
+        if set_config_result < 0:
+            get_native_error = TransmitterWrapper.python_lib.GetNativeError
+            get_native_error.restype = c_char_p
+            get_native_error.argtypes = []
+            error_message = get_native_error()
+            raise RuntimeError(
+                "Javonet set config source result: " + str(set_config_result) + ". Native error message: " + str(error_message))
+        else:
+            return set_config_result