javonet-ruby-sdk 2.4.11 → 2.5.0

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

@@ -5,6 +5,9 @@ use lib 'lib';
 use FFI::Platypus;
 use Path::Tiny;
 use File::Spec;
+use Config;
+use POSIX qw(uname);
+
 my $ffi;
 
 my $send_command_native;
@@ -21,14 +24,17 @@ sub initialize {
         my $dir = File::Spec->rel2abs(__FILE__);
         my $current_dir = path($dir)->parent(3);
         my $perl_native_lib;
+
+        my $arch = (uname())[4] =~ /64/ ? "X64" : "X86";
+
         if ($osname eq "linux") {
-            $perl_native_lib = 'Binaries/Native/Linux/X64/libJavonetPerlRuntimeNative.so';
+            $perl_native_lib = "Binaries/Native/Linux/$arch/libJavonetPerlRuntimeNative.so";
         }
         elsif ($osname eq "darwin") {
-            $perl_native_lib = 'Binaries/Native/MacOs/X64/libJavonetPerlRuntimeNative.dylib';
+            $perl_native_lib = "Binaries/Native/MacOs/$arch/libJavonetPerlRuntimeNative.dylib";
         }
         else {
-            $perl_native_lib = 'Binaries/Native/Windows/X64/JavonetPerlRuntimeNative.dll';
+            $perl_native_lib = "Binaries/Native/Windows/$arch/JavonetPerlRuntimeNative.dll";
         }
         $ffi->lib("$current_dir/$perl_native_lib");
         $send_command_native = $ffi->function('SendCommand' => [ 'uchar[]', 'int' ] => 'int');
@@ -85,4 +91,4 @@ sub set_config_source {
     }
 }
 
-1;
+1;

data/lib/javonet-ruby-sdk/Binaries/Perl/Linux/X64/lib/Javonet/JavonetPerlSdk.pm

@@ -0,0 +1,2 @@
+package JavonetPerlSdk;
+1;

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

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

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

@@ -5,6 +5,9 @@ use lib 'lib';
 use FFI::Platypus;
 use Path::Tiny;
 use File::Spec;
+use Config;
+use POSIX qw(uname);
+
 my $ffi;
 
 my $send_command_native;
@@ -21,14 +24,17 @@ sub initialize {
         my $dir = File::Spec->rel2abs(__FILE__);
         my $current_dir = path($dir)->parent(3);
         my $perl_native_lib;
+
+        my $arch = (uname())[4] =~ /64/ ? "X64" : "X86";
+
         if ($osname eq "linux") {
-            $perl_native_lib = 'Binaries/Native/Linux/X64/libJavonetPerlRuntimeNative.so';
+            $perl_native_lib = "Binaries/Native/Linux/$arch/libJavonetPerlRuntimeNative.so";
         }
         elsif ($osname eq "darwin") {
-            $perl_native_lib = 'Binaries/Native/MacOs/X64/libJavonetPerlRuntimeNative.dylib';
+            $perl_native_lib = "Binaries/Native/MacOs/$arch/libJavonetPerlRuntimeNative.dylib";
         }
         else {
-            $perl_native_lib = 'Binaries/Native/Windows/X64/JavonetPerlRuntimeNative.dll';
+            $perl_native_lib = "Binaries/Native/Windows/$arch/JavonetPerlRuntimeNative.dll";
         }
         $ffi->lib("$current_dir/$perl_native_lib");
         $send_command_native = $ffi->function('SendCommand' => [ 'uchar[]', 'int' ] => 'int');
@@ -85,4 +91,4 @@ sub set_config_source {
     }
 }
 
-1;
+1;

data/lib/javonet-ruby-sdk/Binaries/Perl/Windows/X64/lib/Javonet/JavonetPerlSdk.pm

@@ -0,0 +1,2 @@
+package JavonetPerlSdk;
+1;

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

@@ -9,15 +9,15 @@ 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'
+
     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_path = file_path + f'/Binaries/Native/Windows/{arch}/JavonetPythonRuntimeNative.dll'
+    elif platform.system() == 'Linux':
+        python_lib_path = file_path + f'/Binaries/Native/Linux/{arch}/libJavonetPythonRuntimeNative.so'
+    elif platform.system() == 'Darwin':
+        python_lib_path = file_path + f'/Binaries/Native/MacOs/{arch}/libJavonetPythonRuntimeNative.dylib'
 
     python_lib = cdll.LoadLibrary(python_lib_path)
     python_lib.SetCallback(callbackFunction)

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

@@ -1,16 +1,20 @@
 module TransmitterWrapper
   extend FFI::Library
+
+  arch = FFI::Platform::ARCH == 'x86_64' ? 'X64' : 'X86'
+
   if OS.linux?
-    ffi_lib File.expand_path('../../../Binaries/Native/Linux/X64/libJavonetRubyRuntimeNative.so', __FILE__)
+    ffi_lib File.expand_path("../../../Binaries/Native/Linux/#{arch}/libJavonetRubyRuntimeNative.so", __FILE__)
   elsif OS.mac?
-    ffi_lib File.expand_path('../../../Binaries/Native/MacOs/X64/libJavonetRubyRuntimeNative.dylib', __FILE__)
+    ffi_lib File.expand_path("../../../Binaries/Native/MacOs/#{arch}/libJavonetRubyRuntimeNative.dylib", __FILE__)
   else
-    RubyInstaller::Runtime.add_dll_directory(File.expand_path('../../../Binaries/Native/Windows/X64/', __FILE__))
-    ffi_lib File.expand_path('../../../Binaries/Native/Windows/X64/JavonetRubyRuntimeNative.dll', __FILE__)
+    RubyInstaller::Runtime.add_dll_directory(File.expand_path("../../../Binaries/Native/Windows/#{arch}/", __FILE__))
+    ffi_lib File.expand_path("../../../Binaries/Native/Windows/#{arch}/JavonetRubyRuntimeNative.dll", __FILE__)
   end
+
   attach_function :SendCommand, [:pointer, :int], :int
   attach_function :ReadResponse, [:pointer, :int], :int
   attach_function :Activate, [:pointer, :pointer, :pointer, :pointer], :int
   attach_function :GetNativeError, [], :string
   attach_function :SetConfigSource, [:pointer], :int
-end
+end

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

@@ -1,16 +1,20 @@
 module TransmitterWrapper
   extend FFI::Library
+
+  arch = FFI::Platform::ARCH == 'x86_64' ? 'X64' : 'X86'
+
   if OS.linux?
-    ffi_lib File.expand_path('../../../Binaries/Native/Linux/X64/libJavonetRubyRuntimeNative.so', __FILE__)
+    ffi_lib File.expand_path("../../../Binaries/Native/Linux/#{arch}/libJavonetRubyRuntimeNative.so", __FILE__)
   elsif OS.mac?
-    ffi_lib File.expand_path('../../../Binaries/Native/MacOs/X64/libJavonetRubyRuntimeNative.dylib', __FILE__)
+    ffi_lib File.expand_path("../../../Binaries/Native/MacOs/#{arch}/libJavonetRubyRuntimeNative.dylib", __FILE__)
   else
-    RubyInstaller::Runtime.add_dll_directory(File.expand_path('../../../Binaries/Native/Windows/X64/', __FILE__))
-    ffi_lib File.expand_path('../../../Binaries/Native/Windows/X64/JavonetRubyRuntimeNative.dll', __FILE__)
+    RubyInstaller::Runtime.add_dll_directory(File.expand_path("../../../Binaries/Native/Windows/#{arch}/", __FILE__))
+    ffi_lib File.expand_path("../../../Binaries/Native/Windows/#{arch}/JavonetRubyRuntimeNative.dll", __FILE__)
   end
+
   attach_function :SendCommand, [:pointer, :int], :int
   attach_function :ReadResponse, [:pointer, :int], :int
   attach_function :Activate, [:pointer, :pointer, :pointer, :pointer], :int
   attach_function :GetNativeError, [], :string
   attach_function :SetConfigSource, [:pointer], :int
-end
+end

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

@@ -1,16 +1,20 @@
 module TransmitterWrapper
   extend FFI::Library
+
+  arch = FFI::Platform::ARCH == 'x86_64' ? 'X64' : 'X86'
+
   if OS.linux?
-    ffi_lib File.expand_path('../../../Binaries/Native/Linux/X64/libJavonetRubyRuntimeNative.so', __FILE__)
+    ffi_lib File.expand_path("../../../Binaries/Native/Linux/#{arch}/libJavonetRubyRuntimeNative.so", __FILE__)
   elsif OS.mac?
-    ffi_lib File.expand_path('../../../Binaries/Native/MacOs/X64/libJavonetRubyRuntimeNative.dylib', __FILE__)
+    ffi_lib File.expand_path("../../../Binaries/Native/MacOs/#{arch}/libJavonetRubyRuntimeNative.dylib", __FILE__)
   else
-    RubyInstaller::Runtime.add_dll_directory(File.expand_path('../../../Binaries/Native/Windows/X64/', __FILE__))
-    ffi_lib File.expand_path('../../../Binaries/Native/Windows/X64/JavonetRubyRuntimeNative.dll', __FILE__)
+    RubyInstaller::Runtime.add_dll_directory(File.expand_path("../../../Binaries/Native/Windows/#{arch}/", __FILE__))
+    ffi_lib File.expand_path("../../../Binaries/Native/Windows/#{arch}/JavonetRubyRuntimeNative.dll", __FILE__)
   end
+
   attach_function :SendCommand, [:pointer, :int], :int
   attach_function :ReadResponse, [:pointer, :int], :int
   attach_function :Activate, [:pointer, :pointer, :pointer, :pointer], :int
   attach_function :GetNativeError, [], :string
   attach_function :SetConfigSource, [:pointer], :int
-end
+end

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

@@ -1 +1 @@
-2.4.11
+2.5.0

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

@@ -1,16 +1,20 @@
 module TransmitterWrapper
   extend FFI::Library
+
+  arch = FFI::Platform::ARCH == 'x86_64' ? 'X64' : 'X86'
+
   if OS.linux?
-    ffi_lib File.expand_path('../../../Binaries/Native/Linux/X64/libJavonetRubyRuntimeNative.so', __FILE__)
+    ffi_lib File.expand_path("../../../Binaries/Native/Linux/#{arch}/libJavonetRubyRuntimeNative.so", __FILE__)
   elsif OS.mac?
-    ffi_lib File.expand_path('../../../Binaries/Native/MacOs/X64/libJavonetRubyRuntimeNative.dylib', __FILE__)
+    ffi_lib File.expand_path("../../../Binaries/Native/MacOs/#{arch}/libJavonetRubyRuntimeNative.dylib", __FILE__)
   else
-    RubyInstaller::Runtime.add_dll_directory(File.expand_path('../../../Binaries/Native/Windows/X64/', __FILE__))
-    ffi_lib File.expand_path('../../../Binaries/Native/Windows/X64/JavonetRubyRuntimeNative.dll', __FILE__)
+    RubyInstaller::Runtime.add_dll_directory(File.expand_path("../../../Binaries/Native/Windows/#{arch}/", __FILE__))
+    ffi_lib File.expand_path("../../../Binaries/Native/Windows/#{arch}/JavonetRubyRuntimeNative.dll", __FILE__)
   end
+
   attach_function :SendCommand, [:pointer, :int], :int
   attach_function :ReadResponse, [:pointer, :int], :int
   attach_function :Activate, [:pointer, :pointer, :pointer, :pointer], :int
   attach_function :GetNativeError, [], :string
   attach_function :SetConfigSource, [:pointer], :int
-end
+end

data/lib/javonet-ruby-sdk/sdk/config_runtime_factory.rb

@@ -1,3 +1,4 @@
+require 'pathname'
 require_relative './internal/abstract_config_runtime_factory'
 require_relative './runtime_context'
 require_relative './../utils/connection_type'
@@ -82,11 +83,29 @@ class ConfigRuntimeFactory < AbstractConfigRuntimeFactory
     if conn_type == "tcp"
       conn_data = TcpConnectionData.new(jfr.get_channel_host(RuntimeNameHandler.get_name(runtime), config_name),
                                         jfr.get_channel_port(RuntimeNameHandler.get_name(runtime), config_name))
-      return RuntimeContext.get_instance(runtime, ConnectionType::TCP, conn_data)
+      rtm_ctx =  RuntimeContext.get_instance(runtime, ConnectionType::TCP, conn_data)
     elsif conn_type == "inMemory"
-      return RuntimeContext.get_instance(runtime, ConnectionType::IN_MEMORY, nil)
+      rtm_ctx = RuntimeContext.get_instance(runtime, ConnectionType::IN_MEMORY, nil)
     else
       raise "Invalid connection type"
     end
+    load_modules(runtime, config_name, jfr, rtm_ctx)
+    rtm_ctx
+  end
+
+  def load_modules(runtime, config_name, jfr, rtm_ctx)
+    modules = jfr.get_modules(RuntimeNameHandler.get_name(runtime), config_name)
+                 .split(';')
+                 .reject(&:empty?)
+
+    config_directory_absolute_path = File.dirname(@path)
+
+    modules.each do |mod|
+      if Pathname.new(mod).absolute?
+        rtm_ctx.load_library(mod)
+      else
+        rtm_ctx.load_library(File.join(config_directory_absolute_path, mod))
+      end
+    end
   end
 end

data/lib/javonet-ruby-sdk/sdk/tools/json_file_resolver.rb

@@ -52,4 +52,12 @@ class JsonFileResolver
     channel = get_channel(runtime_name, config_name)
     channel["port"] || (raise "Channel port not found in configuration file for config #{config_name}. Please check your configuration file.")
   end
+
+  def get_modules(runtime_name, config_name)
+    runtime = get_runtime(runtime_name, config_name)
+    if runtime.key?('modules')
+      return runtime['modules']
+    end
+    ""
+  end
 end