javonet-ruby-sdk 2.5.10 → 2.5.11

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.10
+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

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

@@ -0,0 +1,71 @@
+require 'net/http'
+require 'json'
+require 'socket'
+require 'date'
+require_relative 'activation_helper'
+
+class SdkMessageHelper
+  ADDRESS = "https://dc.services.visualstudio.com/v2/track"
+  INSTRUMENTATION_KEY = "2c751560-90c8-40e9-b5dd-534566514723"
+  CALLING_RUNTIME_NAME = "Ruby"
+  JAVONET_VERSION = Gem.loaded_specs["javonet-ruby-sdk"]&.version.to_s || "Unknown"
+  NODE_NAME = Socket.gethostname rescue "Unknown Host"
+  OS_NAME = case RUBY_PLATFORM
+            when /darwin/ then "MacOS"
+            when /linux/ then "Linux"
+            when /freebsd/ then "FreeBSD"
+            when /mswin|msys|mingw|cygwin|bccwin|wince|emc/ then "Windows"
+            else "Unknown"
+            end
+
+  def self.send_message_to_app_insights(operation_name, message)
+    Thread.new do
+      send_message_to_app_insights_func(operation_name, message)
+    end
+  end
+
+  def self.send_message_to_app_insights_func(operation_name, message)
+    begin
+      formatted_datetime = Time.now.utc.strftime("%Y-%m-%dT%H:%M:%S")
+      license_key = ActivationHelper.get_license_key
+      payload = {
+        "name": "AppEvents",
+        "time": formatted_datetime,
+        "iKey": INSTRUMENTATION_KEY,
+        "tags": {
+          "ai.application.ver": JAVONET_VERSION,
+          "ai.cloud.roleInstance": NODE_NAME,
+          "ai.operation.id": "0",
+          "ai.operation.parentId": "0",
+          "ai.operation.name": operation_name,
+          "ai.internal.sdkVersion": "javonet:2",
+          "ai.internal.nodeName": NODE_NAME
+        },
+        "data": {
+          "baseType": "EventData",
+          "baseData": {
+            "ver": 2,
+            "name": message,
+            "properties": {
+              "OperatingSystem": OS_NAME,
+              "LicenseKey": license_key,
+              "CallingTechnology": CALLING_RUNTIME_NAME
+            }
+          }
+        }
+      }
+
+      uri = URI(ADDRESS)
+      request = Net::HTTP::Post.new(uri, 'Content-Type' => 'application/json')
+      request.body = payload.to_json
+
+      response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
+        http.request(request)
+      end
+
+      response.code.to_i
+    rescue Exception => e
+      500
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: javonet-ruby-sdk
 version: !ruby/object:Gem::Version
-  version: 2.5.10
+  version: 2.5.11
 platform: ruby
 authors:
 - SdNCenter Sp. z o. o.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-11 00:00:00.000000000 Z
+date: 2025-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.1
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -635,6 +649,7 @@ files:
 - lib/javonet-ruby-sdk/Binaries/Perl/Linux/X64/deps/lib/perl5/YAML/PP/Representer.pm
 - lib/javonet-ruby-sdk/Binaries/Perl/Linux/X64/deps/lib/perl5/YAML/PP/Schema.pm
 - lib/javonet-ruby-sdk/Binaries/Perl/Linux/X64/deps/lib/perl5/YAML/PP/Schema/Binary.pm
+- lib/javonet-ruby-sdk/Binaries/Perl/Linux/X64/deps/lib/perl5/YAML/PP/Schema/Catchall.pm
 - lib/javonet-ruby-sdk/Binaries/Perl/Linux/X64/deps/lib/perl5/YAML/PP/Schema/Core.pm
 - lib/javonet-ruby-sdk/Binaries/Perl/Linux/X64/deps/lib/perl5/YAML/PP/Schema/Failsafe.pm
 - lib/javonet-ruby-sdk/Binaries/Perl/Linux/X64/deps/lib/perl5/YAML/PP/Schema/Include.pm
@@ -1363,6 +1378,7 @@ files:
 - lib/javonet-ruby-sdk/Binaries/Perl/Windows/X64/deps/lib/perl5/YAML/PP/Representer.pm
 - lib/javonet-ruby-sdk/Binaries/Perl/Windows/X64/deps/lib/perl5/YAML/PP/Schema.pm
 - lib/javonet-ruby-sdk/Binaries/Perl/Windows/X64/deps/lib/perl5/YAML/PP/Schema/Binary.pm
+- lib/javonet-ruby-sdk/Binaries/Perl/Windows/X64/deps/lib/perl5/YAML/PP/Schema/Catchall.pm
 - lib/javonet-ruby-sdk/Binaries/Perl/Windows/X64/deps/lib/perl5/YAML/PP/Schema/Core.pm
 - lib/javonet-ruby-sdk/Binaries/Perl/Windows/X64/deps/lib/perl5/YAML/PP/Schema/Failsafe.pm
 - lib/javonet-ruby-sdk/Binaries/Perl/Windows/X64/deps/lib/perl5/YAML/PP/Schema/Include.pm
@@ -1799,8 +1815,9 @@ files:
 - lib/javonet-ruby-sdk/sdk/javonet.rb
 - lib/javonet-ruby-sdk/sdk/runtime_context.rb
 - lib/javonet-ruby-sdk/sdk/runtime_factory.rb
+- lib/javonet-ruby-sdk/sdk/tools/activation_helper.rb
 - lib/javonet-ruby-sdk/sdk/tools/json_file_resolver.rb
-- lib/javonet-ruby-sdk/sdk/tools/sdk_exception_helper.rb
+- lib/javonet-ruby-sdk/sdk/tools/sdk_message_helper.rb
 - lib/javonet-ruby-sdk/utils/command.rb
 - lib/javonet-ruby-sdk/utils/command_type.rb
 - lib/javonet-ruby-sdk/utils/connection_type.rb

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

@@ -1,77 +0,0 @@
-require 'net/http'
-require 'json'
-require 'socket'
-require 'date'
-
-
-
-
-class SdkExceptionHelper
-  def self.send_exception_to_app_insights(e, license_key)
-    Thread.new do
-      begin
-        instrumentation_key = "2c751560-90c8-40e9-b5dd-534566514723"
-        client = Net::HTTP.new('dc.services.visualstudio.com', 443)
-        client.use_ssl = true
-
-        javonet_version = "2.0.0" # Replace with your desired version
-        node_name = Socket.gethostname rescue "Unknown Host"
-        operation_name = "JavonetSdkException"
-        os_name =
-        if RUBY_PLATFORM =~ /darwin/
-          "MacOS"
-        elsif RUBY_PLATFORM =~ /linux/
-          "Linux"
-        elsif RUBY_PLATFORM =~ /freebsd/
-          "FreeBSD"
-        elsif RUBY_PLATFORM =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-          "Windows"
-        else
-          "Unknown"
-        end
-        calling_runtime_name = "Ruby"
-        event_message = e.to_s
-
-        formatted_datetime = Time.now.gmtime.strftime("%Y-%m-%dT%H:%M:%S")
-
-        payload = {
-          "name": "AppEvents",
-          "time": formatted_datetime,
-          "iKey": instrumentation_key,
-          "tags": {
-            "ai.application.ver": javonet_version,
-            "ai.cloud.roleInstance": node_name,
-            "ai.operation.id": "0",
-            "ai.operation.parentId": "0",
-            "ai.operation.name": operation_name,
-            "ai.internal.sdkVersion": "javonet:2",
-            "ai.internal.nodeName": node_name
-          },
-          "data": {
-            "baseType": "EventData",
-            "baseData": {
-              "ver": 2,
-              "name": event_message,
-              "properties": {
-                "OperatingSystem": os_name,
-                "LicenseKey": license_key,
-                "CallingTechnology": calling_runtime_name
-              }
-            }
-          }
-        }
-
-        request = Net::HTTP::Post.new('/v2/track')
-        request['Content-Type'] = 'application/json'
-        request.body = payload.to_json
-
-        response = client.request(request)
-        response_code = response.code.to_i
-        response_code
-      rescue Exception => ex
-        puts ex
-        500
-      end
-    end
-  end
-end