javonet-ruby-sdk 2.5.9 → 2.5.11

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

@@ -2,7 +2,7 @@ package Javonet::Core::Transmitter::PerlTransmitter;
 use strict;
 use warnings;
 use Cwd;
-use aliased 'Javonet::Core::Transmitter::PerlTransmitterWrapper' => 'PerlTransmitterWrapper' , qw(send_command activate);
+use aliased 'Javonet::Core::Transmitter::PerlTransmitterWrapper' => 'PerlTransmitterWrapper' , qw(send_command activate set_config_source set_javonet_working_directory);
 
 sub send_command {
     my ($self, $message_byte_array_ref) = @_;
@@ -20,4 +20,9 @@ sub set_config_source {
     PerlTransmitterWrapper->set_config_source($config_path);
 }
 
+sub set_javonet_working_directory {
+    my ($self, $working_directory) = @_;
+    PerlTransmitterWrapper->set_javonet_working_directory($working_directory);
+}
+
 1;

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

@@ -15,6 +15,7 @@ my $read_response_native;
 my $activate_native;
 my $get_native_error_native;
 my $set_config_source_native;
+my $set_working_directory_native;
 
 sub initialize {
     my $osname = $^O;
@@ -53,6 +54,7 @@ sub initialize {
         $activate_native = $ffi->function('Activate' => ['string'] => 'int');
         $get_native_error_native = $ffi->function('GetNativeError' => [] => 'string');
         $set_config_source_native = $ffi->function('SetConfigSource' => ['string'] => 'int');
+        $set_working_directory_native = $ffi->function('SetWorkingDirectory' => ['string'] => 'int');
     }
 }
 
@@ -102,4 +104,17 @@ sub set_config_source {
     }
 }
 
+sub set_javonet_working_directory {
+    my ($self, $working_directory) = @_;
+    initialize();
+    my $set_working_directory_result = $set_working_directory_native->($working_directory);
+    if ($set_working_directory_result < 0) {
+        my $error_message = $get_native_error_native->();
+        die "Javonet set working directory result: $set_working_directory_result. Native error message: $error_message";
+    }
+    else {
+        return $set_working_directory_result;
+    }
+}
+
 1;

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

@@ -6,12 +6,12 @@ use lib 'lib';
 use Try::Tiny;
 use threads;
 use aliased 'Javonet::Sdk::Internal::RuntimeFactory' => 'RuntimeFactory';
-use aliased 'Javonet::Core::Transmitter::PerlTransmitter' => 'Transmitter', qw(activate_with_license_file activate_with_credentials activate_with_credentials_and_proxy);
+use aliased 'Javonet::Core::Transmitter::PerlTransmitter' => 'Transmitter', qw(activate send_command set_config_source set_javonet_working_directory);
 use aliased 'Javonet::Core::Exception::SdkExceptionHelper' => 'SdkExceptionHelper';
 use aliased 'Javonet::Sdk::Core::RuntimeLogger' => 'RuntimeLogger', qw(get_runtime_info);
 
 BEGIN {
-    SdkExceptionHelper->send_exception_to_app_insights("SdkMessage","Javonet Sdk initialized");
+    SdkExceptionHelper->send_exception_to_app_insights("SdkMessage", "Javonet Sdk initialized");
 }
 
 sub activate {
@@ -40,7 +40,7 @@ sub with_config {
         Transmitter->set_config_source($config_path);
         return RuntimeFactory->new(Javonet::Sdk::Internal::ConnectionType::get_connection_type('WithConfig'), undef, $config_path);
     } catch {
-        SdkExceptionHelper->send_exception_to_app_insights($_,"withConfig");
+        SdkExceptionHelper->send_exception_to_app_insights("SdkException", $_);
         die $_;
     };
 }
@@ -54,9 +54,27 @@ sub set_config_source {
     try {
         Transmitter->set_config_source($config_path);
     } catch {
-        SdkExceptionHelper->send_exception_to_app_insights($_,"setConfigSource");
+        SdkExceptionHelper->send_exception_to_app_insights("SdkException", $_);
         die $_;
     };
 }
 
+# Sets the working directory for the Javonet SDK.
+# @param $path [String] The working directory path.
+sub set_javonet_working_directory {
+    my ($self, $path) = @_;
+    try {
+        $path =~ s{\\}{/}g;
+        $path .= '/' unless $path =~ m{/$};
+        mkdir $path, 0700 unless -d $path;
+        #ActivationHelper->working_directory($path);
+        Transmitter->set_javonet_working_directory($path);
+    } catch {
+        SdkExceptionHelper->send_exception_to_app_insights("SdkException", $_);
+        die $_;
+    };
+}
+
+
+
 1;

data/lib/javonet-ruby-sdk/Binaries/Python/javonet/core/handler/GetTypeHandler.py

@@ -45,7 +45,7 @@ class GetTypeHandler(AbstractCommandHandler):
             exc_type, exc_value = type(e), e
             sys_path = "\n".join(sys.path)
             available_types = "\n".join(self.get_all_available_types())
-            new_message = str(e) + "\nLoaded directories: " + sys_path  + "\nAvailable user types:\n" + available_types + "\n\n\n"
+            new_message = str(e) + "\nLoaded directories:\n" + sys_path  + "\nAvailable user types:\n" + available_types + "\n\n\n"
             new_exc = exc_type(new_message).with_traceback(e.__traceback__)
             raise new_exc from None
 
@@ -65,22 +65,21 @@ class GetTypeHandler(AbstractCommandHandler):
         loaded_module = import_module(module_name)
         return getattr(loaded_module, class_name)
 
-
     def get_all_available_types(self):
-        available_types = []
+        available_types = set()
         for directory in LoadLibraryHandler.loaded_directories:
             for root, _, files in os.walk(directory):
+                if "Binaries" in root:
+                    continue
                 for file in files:
                     if file.lower().endswith(".py") and file != "__init__.py":
                         module_name = os.path.splitext(file)[0]
-                        module_path = os.path.relpath(os.path.join(root, module_name), directory)
-                        module_path = module_path.replace(os.sep, ".")
+                        module_path = os.path.relpath(os.path.join(root, module_name), directory).replace(os.sep, ".")
                         try:
                             module = importlib.import_module(module_path)
                             for name, obj in inspect.getmembers(module, inspect.isclass):
-                                # Store the fully qualified class name
                                 qualified_name = f"{module_path}.{name}"
-                                available_types.append(qualified_name)
-                        except Exception as e:
-                            logging.error(f"Error importing {module_path}: {e}")
-        return available_types
+                                available_types.add(qualified_name)
+                        except Exception:
+                            pass
+        return list(available_types)

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

@@ -13,4 +13,8 @@ class Transmitter:
 
     @staticmethod
     def set_config_source(source_path):
-        return TransmitterWrapper.set_config_source(source_path)
+        return TransmitterWrapper.set_config_source(source_path)
+
+    @staticmethod
+    def set_javonet_working_directory(path):
+        return TransmitterWrapper.set_javonet_working_directory(path)

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

@@ -90,4 +90,23 @@ class TransmitterWrapper:
                 "Javonet set config source result: " + str(set_config_result) + ". Native error message: " + str(
                     error_message))
         else:
-            return set_config_result
+            return set_config_result
+
+    @staticmethod
+    def set_javonet_working_directory(path):
+        set_working_directory = TransmitterWrapper.python_lib.SetWorkingDirectory
+        set_working_directory.restype = c_int
+        set_working_directory.argtypes = [c_char_p]
+
+        set_working_directory_result = set_working_directory(path.encode('utf-8'))
+
+        if set_working_directory_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 working directory result: " + str(set_working_directory_result) + ". Native error message: " + str(
+                    error_message))
+        else:
+            return set_working_directory_result

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

@@ -45,4 +45,14 @@ class Transmitter
       return set_config_result
     end
   end
+
+  def self.set_javonet_working_directory(config_path)
+    set_working_directory_result = TransmitterWrapper.SetWorkingDirectory(config_path)
+    if set_working_directory_result < 0
+      error_message = get_native_error
+      raise Exception.new "Javonet set working directory result: " + set_working_directory_result.to_s + ". Native error message: " + error_message
+    else
+      return set_working_directory_result
+    end
+  end
 end

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

@@ -28,4 +28,5 @@ module TransmitterWrapper
   attach_function :Activate, [:pointer], :int
   attach_function :GetNativeError, [], :string
   attach_function :SetConfigSource, [:pointer], :int
+  attach_function :SetWorkingDirectory, [:pointer], :int
 end

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

@@ -45,4 +45,14 @@ class Transmitter
       return set_config_result
     end
   end
+
+  def self.set_javonet_working_directory(config_path)
+    set_working_directory_result = TransmitterWrapper.SetWorkingDirectory(config_path)
+    if set_working_directory_result < 0
+      error_message = get_native_error
+      raise Exception.new "Javonet set working directory result: " + set_working_directory_result.to_s + ". Native error message: " + error_message
+    else
+      return set_working_directory_result
+    end
+  end
 end

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

@@ -28,4 +28,5 @@ module TransmitterWrapper
   attach_function :Activate, [:pointer], :int
   attach_function :GetNativeError, [], :string
   attach_function :SetConfigSource, [:pointer], :int
+  attach_function :SetWorkingDirectory, [:pointer], :int
 end

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

@@ -45,4 +45,14 @@ class Transmitter
       return set_config_result
     end
   end
+
+  def self.set_javonet_working_directory(config_path)
+    set_working_directory_result = TransmitterWrapper.SetWorkingDirectory(config_path)
+    if set_working_directory_result < 0
+      error_message = get_native_error
+      raise Exception.new "Javonet set working directory result: " + set_working_directory_result.to_s + ". Native error message: " + error_message
+    else
+      return set_working_directory_result
+    end
+  end
 end

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

@@ -28,4 +28,5 @@ module TransmitterWrapper
   attach_function :Activate, [:pointer], :int
   attach_function :GetNativeError, [], :string
   attach_function :SetConfigSource, [:pointer], :int
+  attach_function :SetWorkingDirectory, [:pointer], :int
 end

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

@@ -1 +1 @@
-2.5.9
+2.5.11

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

@@ -45,4 +45,14 @@ class Transmitter
       return set_config_result
     end
   end
+
+  def self.set_javonet_working_directory(config_path)
+    set_working_directory_result = TransmitterWrapper.SetWorkingDirectory(config_path)
+    if set_working_directory_result < 0
+      error_message = get_native_error
+      raise Exception.new "Javonet set working directory result: " + set_working_directory_result.to_s + ". Native error message: " + error_message
+    else
+      return set_working_directory_result
+    end
+  end
 end

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

@@ -28,4 +28,5 @@ module TransmitterWrapper
   attach_function :Activate, [:pointer], :int
   attach_function :GetNativeError, [], :string
   attach_function :SetConfigSource, [:pointer], :int
+  attach_function :SetWorkingDirectory, [:pointer], :int
 end

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

@@ -97,7 +97,7 @@ class ConfigRuntimeFactory < AbstractConfigRuntimeFactory
 
   def load_modules(runtime, config_name, jfr, rtm_ctx)
     modules = jfr.get_modules(RuntimeNameHandler.get_name(runtime), config_name)
-                 .split(';')
+                 .split(',')
                  .reject(&:empty?)
 
     config_directory_absolute_path = File.dirname(@path)

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

@@ -69,7 +69,9 @@ class InvocationContext < AbstractInvocationContext
     @response_command = @interpreter.execute(@current_command, @connection_type, @tcp_ip_address)
 
     if @response_command.command_type == CommandType::EXCEPTION
-      raise ExceptionThrower.throw_exception(@response_command)
+        exception = ExceptionThrower.throw_exception(@response_command)
+        SdkMessageHelper.send_message_to_app_insights("SdkException",  exception.message)
+      raise exception
     end
 
     if @response_command.command_type == CommandType::CREATE_CLASS_INSTANCE

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

@@ -4,8 +4,8 @@ require_relative './../utils/connection_type'
 require_relative './../utils/tcp_connection_data'
 require_relative './../utils/runtime_logger'
 require_relative './../core/transmitter/transmitter'
-require_relative './tools/sdk_exception_helper'
-
+require_relative './tools/sdk_message_helper'
+require 'fileutils'
 
 # The Javonet class is a singleton class that serves as the entry point for interacting with Javonet.
 # It provides methods to activate and initialize the Javonet SDK.
@@ -13,7 +13,7 @@ require_relative './tools/sdk_exception_helper'
 # @see Refer to this {https://www.javonet.com/guides/v2/ruby/foundations/javonet-static-class article on Javonet Guides}
 class Javonet
 
-  SdkExceptionHelper.send_exception_to_app_insights("SdkMessage", "Javonet SDK initialized")
+  SdkMessageHelper.send_message_to_app_insights("SdkMessage", "Javonet SDK initialized")
 
   # Initializes Javonet using an in-memory channel on the same machine.
   # @return [RuntimeFactory] A RuntimeFactory instance configured for an in-memory connection.
@@ -38,7 +38,7 @@ class Javonet
     begin
       ConfigRuntimeFactory.new(path)
     rescue Exception => e
-      SdkExceptionHelper.send_exception_to_app_insights(e, "withConfig")
+      SdkMessageHelper.send_message_to_app_insights("SdkException", e.message)
       raise e
     end
 
@@ -50,13 +50,44 @@ class Javonet
   # @see https://www.javonet.com/guides/v2/ruby/getting-started/activating-javonet Activating Javonet Guide
   def self.activate(license_key)
     begin
+      if license_key != ActivationHelper.temporary_license_key
+        ActivationHelper.temporary_license_key = license_key
+        SdkMessageHelper.send_message_to_app_insights("SdkMessage", "Activation")
+      end
+
+      ActivationHelper.temporary_license_key = license_key
       return Transmitter.activate(license_key)
     rescue Exception => e
-      SdkExceptionHelper.send_exception_to_app_insights(e, license_key)
+      SdkMessageHelper.send_message_to_app_insights("SdkException", e.message)
       raise e
     end
   end
 
+  # Sets the configuration source for the Javonet SDK.
+  # @param config_source [String] The configuration source.
+  def self.set_config_source(config_source)
+    begin
+      Transmitter.set_config_source(config_source)
+    rescue Exception => e
+      SdkMessageHelper.send_message_to_app_insights("SdkException", e.message)
+      raise e
+    end
+  end
+
+  # Sets the working directory for the Javonet SDK.
+  # @param path [String] The working directory path.
+  def self.set_javonet_working_directory(path)
+    begin
+      path.gsub!("\\", "/")
+      path += "/" unless path.end_with?("/")
+      FileUtils.mkdir_p(path, mode: 0700)
+      ActivationHelper.working_directory = path
+      Transmitter.set_javonet_working_directory(path)
+    rescue Exception => e
+      SdkMessageHelper.send_message_to_app_insights("SdkException", e.message)
+      raise e
+    end
+  end
 
   # Gets information about the current runtime.
   # @param get_loaded_modules [Boolean] Whether to include loaded modules in the runtime information.
@@ -65,10 +96,4 @@ class Javonet
     RuntimeLogger.get_runtime_info(get_loaded_modules)
   end
 
-  # Sets the configuration source for the Javonet SDK.
-  # @param config_source [String] The configuration source.
-  def self.set_config_source(config_source)
-    Transmitter.set_config_source(config_source)
-  end
-
 end

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

@@ -28,6 +28,7 @@ class RuntimeContext < AbstractRuntimeContext
     @tcp_ip_address = tcp_connection_data
     @current_command = nil
     @interpreter = Interpreter.new
+    SdkMessageHelper.send_message_to_app_insights("SdkMessage", RuntimeNameHandler.get_name(@runtime_name).capitalize + " initialized")
   end
 
   def self.get_instance(runtime_name, connection_type, tcp_connection_data)
@@ -65,8 +66,11 @@ class RuntimeContext < AbstractRuntimeContext
   def execute
     @response_command = @interpreter.execute(@current_command, @connection_type, @tcp_ip_address)
     @current_command = nil
+
     if @response_command.command_type == CommandType::EXCEPTION
-      raise ExceptionThrower.throw_exception(@response_command)
+        exception = ExceptionThrower.throw_exception(@response_command)
+        SdkMessageHelper.send_message_to_app_insights("SdkException",  exception.message)
+      raise exception
     end
   end
 

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

@@ -0,0 +1,38 @@
+require 'rexml/document'
+require 'fileutils'
+
+class ActivationHelper
+  @temporary_license_key = "License key not set"
+  @working_directory = ""
+
+  class << self
+    attr_accessor :temporary_license_key, :working_directory
+
+    def get_license_key
+      begin
+        get_license_key_from_file
+      rescue
+        @temporary_license_key
+      end
+    end
+
+    private
+
+    def get_license_key_from_file
+      file_path = File.join(@working_directory, "javonet.lic")
+      raise "License file not found." unless File.exist?(file_path)
+
+      file = File.read(file_path)
+      doc = REXML::Document.new(file)
+      ns = 'https://ssl2.hostedwindows.pl/sdncenter-com/'
+      activate_result_element = REXML::XPath.first(doc, "//ns:ActivateResult", { 'ns' => ns })
+      raise "ActivateResult element not found in the SOAP response." if activate_result_element.nil?
+
+      inner_doc = REXML::Document.new(activate_result_element.text)
+      license_key_element = REXML::XPath.first(inner_doc, "//ns:licenceKey", { 'ns' => ns })
+      raise "License key not found in the ActivateResult." if license_key_element.nil?
+
+      license_key_element.text
+    end
+  end
+end