javonet-ruby-sdk 2.5.0 → 2.5.1

data/lib/javonet-ruby-sdk/Binaries/Perl/Linux/X64/lib/Javonet/Core/Transmitter/PerlTransmitterWrapper.pm

@@ -25,7 +25,18 @@ sub initialize {
         my $current_dir = path($dir)->parent(3);
         my $perl_native_lib;
 
-        my $arch = (uname())[4] =~ /64/ ? "X64" : "X86";
+        my $arch = do {
+            my $uname = (uname())[4];
+            if ($uname =~ /64/) {
+                "X64";
+            } elsif ($uname =~ /arm64|aarch64/) {
+                "ARM64";
+            } elsif ($uname =~ /arm/) {
+                "ARM";
+            } else {
+                "X86";
+            }
+        };
 
         if ($osname eq "linux") {
             $perl_native_lib = "Binaries/Native/Linux/$arch/libJavonetPerlRuntimeNative.so";

data/lib/javonet-ruby-sdk/Binaries/Perl/Windows/X64/deps/lib/perl5/MSWin32-x64-multi-thread/perllocal.pod

@@ -1,4 +1,4 @@
-=head2 Tue Oct  1 12:14:13 2024: C<Module> L<Want|Want>
+=head2 Fri Oct 11 06:11:21 2024: C<Module> L<Data::UUID|Data::UUID>
 
 =over 4
 
@@ -12,7 +12,7 @@ C<LINKTYPE: dynamic>
 
 =item *
 
-C<VERSION: 0.29>
+C<VERSION: 1.227>
 
 =item *
 
@@ -20,7 +20,7 @@ C<EXE_FILES: >
 
 =back
 
-=head2 Tue Oct  1 12:14:20 2024: C<Module> L<PPI|PPI>
+=head2 Fri Oct 11 06:11:25 2024: C<Module> L<Data::Cmp|Data::Cmp>
 
 =over 4
 
@@ -34,7 +34,7 @@ C<LINKTYPE: dynamic>
 
 =item *
 
-C<VERSION: 1.279>
+C<VERSION: 0.010>
 
 =item *
 
@@ -42,7 +42,7 @@ C<EXE_FILES: >
 
 =back
 
-=head2 Tue Oct  1 12:14:26 2024: C<Module> L<PPI::XS|PPI::XS>
+=head2 Fri Oct 11 06:11:33 2024: C<Module> L<PPI|PPI>
 
 =over 4
 
@@ -56,7 +56,7 @@ C<LINKTYPE: dynamic>
 
 =item *
 
-C<VERSION: 0.910>
+C<VERSION: 1.279>
 
 =item *
 
@@ -64,7 +64,7 @@ C<EXE_FILES: >
 
 =back
 
-=head2 Tue Oct  1 12:14:29 2024: C<Module> L<Nice::Try|Nice::Try>
+=head2 Fri Oct 11 06:11:39 2024: C<Module> L<PPI::XS|PPI::XS>
 
 =over 4
 
@@ -78,7 +78,7 @@ C<LINKTYPE: dynamic>
 
 =item *
 
-C<VERSION: v1.3.13>
+C<VERSION: 0.910>
 
 =item *
 
@@ -86,7 +86,7 @@ C<EXE_FILES: >
 
 =back
 
-=head2 Tue Oct  1 12:14:44 2024: C<Module> L<Data::UUID|Data::UUID>
+=head2 Fri Oct 11 06:11:45 2024: C<Module> L<Want|Want>
 
 =over 4
 
@@ -100,7 +100,7 @@ C<LINKTYPE: dynamic>
 
 =item *
 
-C<VERSION: 1.227>
+C<VERSION: 0.29>
 
 =item *
 
@@ -108,7 +108,7 @@ C<EXE_FILES: >
 
 =back
 
-=head2 Tue Oct  1 12:14:49 2024: C<Module> L<Attribute::Util|Attribute::Util>
+=head2 Fri Oct 11 06:11:47 2024: C<Module> L<Nice::Try|Nice::Try>
 
 =over 4
 
@@ -122,7 +122,7 @@ C<LINKTYPE: dynamic>
 
 =item *
 
-C<VERSION: 1.07>
+C<VERSION: v1.3.13>
 
 =item *
 
@@ -130,7 +130,7 @@ C<EXE_FILES: >
 
 =back
 
-=head2 Tue Oct  1 12:14:53 2024: C<Module> L<Data::Cmp|Data::Cmp>
+=head2 Fri Oct 11 06:11:52 2024: C<Module> L<Test::Fatal|Test::Fatal>
 
 =over 4
 
@@ -144,7 +144,7 @@ C<LINKTYPE: dynamic>
 
 =item *
 
-C<VERSION: 0.010>
+C<VERSION: 0.017>
 
 =item *
 
@@ -152,7 +152,7 @@ C<EXE_FILES: >
 
 =back
 
-=head2 Tue Oct  1 12:14:59 2024: C<Module> L<Test::Fatal|Test::Fatal>
+=head2 Fri Oct 11 06:11:57 2024: C<Module> L<autobox|autobox>
 
 =over 4
 
@@ -166,7 +166,7 @@ C<LINKTYPE: dynamic>
 
 =item *
 
-C<VERSION: 0.017>
+C<VERSION: v3.0.2>
 
 =item *
 
@@ -174,7 +174,7 @@ C<EXE_FILES: >
 
 =back
 
-=head2 Tue Oct  1 12:15:06 2024: C<Module> L<autobox|autobox>
+=head2 Fri Oct 11 06:12:01 2024: C<Module> L<Attribute::Util|Attribute::Util>
 
 =over 4
 
@@ -188,7 +188,7 @@ C<LINKTYPE: dynamic>
 
 =item *
 
-C<VERSION: v3.0.2>
+C<VERSION: 1.07>
 
 =item *
 
@@ -196,7 +196,7 @@ C<EXE_FILES: >
 
 =back
 
-=head2 Tue Oct  1 12:15:12 2024: C<Module> L<Scalar::Util::Numeric|Scalar::Util::Numeric>
+=head2 Fri Oct 11 06:12:07 2024: C<Module> L<Scalar::Util::Numeric|Scalar::Util::Numeric>
 
 =over 4
 

data/lib/javonet-ruby-sdk/Binaries/Perl/Windows/X64/lib/Javonet/Core/Transmitter/PerlTransmitterWrapper.pm

@@ -25,7 +25,18 @@ sub initialize {
         my $current_dir = path($dir)->parent(3);
         my $perl_native_lib;
 
-        my $arch = (uname())[4] =~ /64/ ? "X64" : "X86";
+        my $arch = do {
+            my $uname = (uname())[4];
+            if ($uname =~ /64/) {
+                "X64";
+            } elsif ($uname =~ /arm64|aarch64/) {
+                "ARM64";
+            } elsif ($uname =~ /arm/) {
+                "ARM";
+            } else {
+                "X86";
+            }
+        };
 
         if ($osname eq "linux") {
             $perl_native_lib = "Binaries/Native/Linux/$arch/libJavonetPerlRuntimeNative.so";

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

@@ -5,30 +5,26 @@ from javonet.utils.ConnectionType import ConnectionType
 from javonet.utils.RuntimeName import RuntimeName
 from javonet.utils.connectionData.IConnectionData import IConnectionData
 
+handler = Handler()
+
+
 class Interpreter:
 
     def execute(self, command, connection_data: IConnectionData):
-        command_serializer = CommandSerializer()
-        serialized_command = command_serializer.serialize(command, connection_data)
-        response = None
+        message_byte_array = CommandSerializer().serialize(command, connection_data)
         if connection_data.connection_type == ConnectionType.WebSocket:
             from javonet.core.webSocketClient.WebSocketClient import WebSocketClient
-            response = WebSocketClient().send_message(connection_data, serialized_command)
-        elif (command.runtime_name == RuntimeName.python) & (connection_data.connection_type == ConnectionType.InMemory):
+            response_byte_array = WebSocketClient().send_message(connection_data, message_byte_array)
+        elif (command.runtime_name == RuntimeName.python) & (
+                connection_data.connection_type == ConnectionType.InMemory):
             from javonet.core.receiver.Receiver import Receiver
-            response = Receiver().SendCommand(serialized_command, len(serialized_command))
+            response_byte_array = Receiver().SendCommand(message_byte_array, len(message_byte_array))
         else:
             from javonet.core.transmitter.Transmitter import Transmitter
-            response = Transmitter.send_command(serialized_command)
+            response_byte_array = Transmitter.send_command(message_byte_array)
 
-        command_deserializer = CommandDeserializer(response, len(response))
-        return command_deserializer.deserialize()
+        return CommandDeserializer(response_byte_array).deserialize()
 
-    def process(self, byte_array, byte_array_len, connection_data: IConnectionData):
-        command_deserializer = CommandDeserializer(byte_array, byte_array_len)
-        received_command = command_deserializer.deserialize()
-        python_handler = Handler()
-        command_serializer = CommandSerializer()
-        response_command = python_handler.handle_command(received_command)
-        encoded_response = command_serializer.serialize(response_command, connection_data)
-        return encoded_response
+    def process(self, message_byte_array):
+        received_command = CommandDeserializer(message_byte_array).deserialize()
+        return handler.handle_command(received_command)

data/lib/javonet-ruby-sdk/Binaries/Python/javonet/core/protocol/CommandDeserializer.py

@@ -12,9 +12,9 @@ class CommandDeserializer:
     command = 0
     buffer_len = 0
 
-    def __init__(self, buffer, buffer_len):
+    def __init__(self, buffer):
         self.buffer = buffer
-        self.buffer_len = buffer_len
+        self.buffer_len = len(buffer)
         self.command = Command(RuntimeName(buffer[0]), CommandType(buffer[10]), [])
         self.position = 11
 
@@ -68,7 +68,7 @@ class CommandDeserializer:
 
     def read_string(self):
         p = self.position
-        string_encoding_mode = StringEncodingMode(self.buffer[p+1])
+        string_encoding_mode = StringEncodingMode(self.buffer[p + 1])
         size = TypeDeserializer.deserialize_int(self.buffer[p + 2:p + 6])
         self.position += 6
         p = self.position
@@ -87,7 +87,7 @@ class CommandDeserializer:
         self.position += 2
         p = self.position
         self.position += size
-        return TypeDeserializer.deserialize_bool(self.buffer[p:p+size])
+        return TypeDeserializer.deserialize_bool(self.buffer[p:p + size])
 
     def read_float(self):
         size = 4
@@ -95,20 +95,20 @@ class CommandDeserializer:
         p = self.position
         self.position += size
         return TypeDeserializer.deserialize_float(self.buffer[p:p + size])
-    
+
     def read_byte(self):
         size = 1
         self.position += 2
         p = self.position
         self.position += size
-        return TypeDeserializer.deserialize_byte(self.buffer[p:p+size])
-    
+        return TypeDeserializer.deserialize_byte(self.buffer[p:p + size])
+
     def read_char(self):
         size = 1
         self.position += 2
         p = self.position
         self.position += size
-        return TypeDeserializer.deserialize_char(self.buffer[p:p+size])
+        return TypeDeserializer.deserialize_char(self.buffer[p:p + size])
 
     def read_longlong(self):
         size = 8
@@ -144,4 +144,3 @@ class CommandDeserializer:
         p = self.position
         self.position += size
         return TypeDeserializer.deserialize_none(self.buffer[p:p + size])
-    

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

@@ -1,18 +1,18 @@
 from javonet.core.interpreter.Interpreter import Interpreter
+from javonet.core.protocol.CommandSerializer import CommandSerializer
 from javonet.utils.connectionData.InMemoryConnectionData import InMemoryConnectionData
 
 
 class Receiver:
 
     def __init__(self):
-        self.python_interpreter = Interpreter()
         self.connection_data = InMemoryConnectionData()
 
-    def SendCommand(self, messageByteArray, messageByteArrayLen):
-        return bytearray(self.python_interpreter.process(messageByteArray, len(messageByteArray), self.connection_data))
+    def SendCommand(self, message_byte_array, messageByteArrayLen):
+        return bytearray(CommandSerializer().serialize(Interpreter().process(message_byte_array), self.connection_data))
 
-    def HeartBeat(self, messageByteArray, messageByteArrayLen):
+    def HeartBeat(self, message_byte_array, messageByteArrayLen):
         response_byte_array = bytearray(2)
-        response_byte_array[0] = messageByteArray[11]
-        response_byte_array[1] = messageByteArray[12] - 2
+        response_byte_array[0] = message_byte_array[11]
+        response_byte_array[1] = message_byte_array[12] - 2
         return response_byte_array

data/lib/javonet-ruby-sdk/Binaries/Python/javonet/core/transmitter/TransmitterWrapper.py

@@ -10,7 +10,13 @@ callbackFunction = CMPFUNC(callbackFunc)
 
 class TransmitterWrapper:
     file_path = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
-    arch = 'X64' if platform.machine().endswith('64') else 'X86'
+    machine = platform.machine().lower()
+    if '64' in machine:
+        arch = 'X64'
+    elif 'arm' in machine:
+        arch = 'ARM64' if '64' in machine else 'ARM'
+    else:
+        arch = 'X86'
 
     if platform.system() == 'Windows':
         python_lib_path = file_path + f'/Binaries/Native/Windows/{arch}/JavonetPythonRuntimeNative.dll'

data/lib/javonet-ruby-sdk/Binaries/Python/javonet/core/webSocketClient/WebSocketClient.py

@@ -1,4 +1,3 @@
-import asyncio
 import struct
 from websockets.sync.client import connect
 

data/lib/javonet-ruby-sdk/Binaries/Ruby/Linux/X64/core/transmitter/transmitter_wrapper.rb

@@ -1,7 +1,18 @@
 module TransmitterWrapper
   extend FFI::Library
 
-  arch = FFI::Platform::ARCH == 'x86_64' ? 'X64' : 'X86'
+  arch = case FFI::Platform::ARCH
+         when 'x86_64'
+           'X64'
+         when 'x86'
+           'X86'
+         when 'arm'
+           'ARM'
+         when 'aarch64'
+           'ARM64'
+         else
+           raise "Unsupported architecture: #{FFI::Platform::ARCH}"
+         end
 
   if OS.linux?
     ffi_lib File.expand_path("../../../Binaries/Native/Linux/#{arch}/libJavonetRubyRuntimeNative.so", __FILE__)

data/lib/javonet-ruby-sdk/Binaries/Ruby/MacOs/X64/core/transmitter/transmitter_wrapper.rb

@@ -1,7 +1,18 @@
 module TransmitterWrapper
   extend FFI::Library
 
-  arch = FFI::Platform::ARCH == 'x86_64' ? 'X64' : 'X86'
+  arch = case FFI::Platform::ARCH
+         when 'x86_64'
+           'X64'
+         when 'x86'
+           'X86'
+         when 'arm'
+           'ARM'
+         when 'aarch64'
+           'ARM64'
+         else
+           raise "Unsupported architecture: #{FFI::Platform::ARCH}"
+         end
 
   if OS.linux?
     ffi_lib File.expand_path("../../../Binaries/Native/Linux/#{arch}/libJavonetRubyRuntimeNative.so", __FILE__)

data/lib/javonet-ruby-sdk/Binaries/Ruby/Windows/X64/core/transmitter/transmitter_wrapper.rb

@@ -1,7 +1,18 @@
 module TransmitterWrapper
   extend FFI::Library
 
-  arch = FFI::Platform::ARCH == 'x86_64' ? 'X64' : 'X86'
+  arch = case FFI::Platform::ARCH
+         when 'x86_64'
+           'X64'
+         when 'x86'
+           'X86'
+         when 'arm'
+           'ARM'
+         when 'aarch64'
+           'ARM64'
+         else
+           raise "Unsupported architecture: #{FFI::Platform::ARCH}"
+         end
 
   if OS.linux?
     ffi_lib File.expand_path("../../../Binaries/Native/Linux/#{arch}/libJavonetRubyRuntimeNative.so", __FILE__)

data/lib/javonet-ruby-sdk/Binaries/version.txt

@@ -1 +1 @@
-2.5.0
+2.5.1

data/lib/javonet-ruby-sdk/core/transmitter/transmitter_wrapper.rb

@@ -1,7 +1,18 @@
 module TransmitterWrapper
   extend FFI::Library
 
-  arch = FFI::Platform::ARCH == 'x86_64' ? 'X64' : 'X86'
+  arch = case FFI::Platform::ARCH
+         when 'x86_64'
+           'X64'
+         when 'x86'
+           'X86'
+         when 'arm'
+           'ARM'
+         when 'aarch64'
+           'ARM64'
+         else
+           raise "Unsupported architecture: #{FFI::Platform::ARCH}"
+         end
 
   if OS.linux?
     ffi_lib File.expand_path("../../../Binaries/Native/Linux/#{arch}/libJavonetRubyRuntimeNative.so", __FILE__)