javonet-nodejs-sdk 2.5.4 → 2.5.5

package/Binaries/Ruby/MacOs/X64/utils/tcp_connection_data.rb

@@ -30,4 +30,8 @@ class TcpConnectionData
   def get_port_bytes
     [@port & 0xFF, @port >> 8]
   end
+
+  def serialize_connection_data
+    [ConnectionType::TCP] + get_address_bytes + get_port_bytes
+  end
 end

package/Binaries/Ruby/Windows/X64/core/interpreter/interpreter.rb

@@ -5,8 +5,8 @@ require_relative '../handler/handler'
 class Interpreter
   @@handler = Handler.new
 
-  def execute(command, connection_type, tcp_connection_data)
-    message_byte_array = CommandSerializer.new.serialize(command, connection_type, tcp_connection_data)
+  def execute(command, connection_type, connection_data)
+    message_byte_array = CommandSerializer.new.serialize(command, connection_data)
     if command.runtime_name == RuntimeName::RUBY && connection_type == ConnectionType::IN_MEMORY
       require_relative '../receiver/receiver'
       response_byte_array = Receiver.new.send_command(message_byte_array, message_byte_array.length)
@@ -18,8 +18,8 @@ class Interpreter
     CommandDeserializer.new(response_byte_array).deserialize
   end
 
-  def process(byte_array, byte_array_len)
+  def process(byte_array)
     received_command = CommandDeserializer.new(byte_array).deserialize
-    CommandSerializer.new.serialize(@@handler.handle_command(received_command))
+    @@handler.handle_command(received_command)
   end
 end

package/Binaries/Ruby/Windows/X64/core/protocol/command_serializer.rb

@@ -1,78 +1,37 @@
 require_relative 'type_serializer'
-require_relative '../../utils/connection_type'
+require_relative '../../utils/command'
 require_relative '../../utils/runtime_name'
 require_relative '../../utils/tcp_connection_data'
 
 class CommandSerializer
-
   def initialize
-    @byte_buffer = []
-  end
-
-  def serialize(root_command, connection_type = ConnectionType::IN_MEMORY, tcp_connection_data = nil, runtime_version = 0)
-    queue = []
-    queue.unshift(root_command)
-    self.insert_into_buffer([root_command.runtime_name, runtime_version])
-    self.insert_into_buffer([connection_type])
-    self.insert_into_buffer(self.serialize_tcp(tcp_connection_data))
-    self.insert_into_buffer([RuntimeName::RUBY, root_command.command_type])
-    self.serialize_recursively(queue)
+    @buffer = []
   end
 
-  def serialize_tcp(tcp_connection_data)
-    if tcp_connection_data.nil?
-      return [0, 0, 0, 0, 0, 0]
+  def serialize(root_command, connection_data = nil, runtime_version = 0)
+    insert_into_buffer([root_command.runtime_name, runtime_version])
+    if connection_data.nil?
+      insert_into_buffer([0, 0, 0, 0, 0, 0, 0])
+    else
+      insert_into_buffer(connection_data.serialize_connection_data)
     end
-    tcp_connection_data.get_address_bytes + tcp_connection_data.get_port_bytes
+    insert_into_buffer([RuntimeName::PYTHON, root_command.command_type])
+    serialize_recursively(root_command)
+    @buffer
   end
 
-  def serialize_primitive(payload_item)
-    if payload_item.nil?
-      return TypeSerializer.serialize_nil
-    elsif [true, false].include? payload_item
-      return TypeSerializer.serialize_bool(payload_item)
-    elsif payload_item.is_a? Integer
-      if (-2 ** 31..2 ** 31).include?(payload_item)
-        return TypeSerializer.serialize_int(payload_item)
-      elsif (-2 ** 63..2 ** 63).include?(payload_item)
-        return TypeSerializer.serialize_longlong(payload_item)
+  def serialize_recursively(command)
+    command.payload.each do |item|
+      if item.is_a?(Command)
+        insert_into_buffer(TypeSerializer.serialize_command(item))
+        serialize_recursively(item)
       else
-        return TypeSerializer.serialize_ullong(payload_item)
+        insert_into_buffer(TypeSerializer.serialize_primitive(item))
       end
-    elsif payload_item.is_a? String
-      return TypeSerializer.serialize_string(payload_item)
-    elsif payload_item.is_a? Float
-      return TypeSerializer.serialize_double(payload_item)
-    elsif payload_item.is_a?
-    else
-      raise Exception.new("Payload not supported in command serializer")
     end
   end
 
   def insert_into_buffer(arguments)
-    @byte_buffer = @byte_buffer + arguments
+    @buffer += arguments
   end
-
-  def serialize_recursively(queue)
-    if queue.length == 0
-      return @byte_buffer
-    end
-    command = queue.shift
-    queue.unshift(command.drop_first_payload_argument)
-    if command.payload.length > 0
-      if command.payload[0].is_a? Command
-        inner_command = command.payload[0]
-        self.insert_into_buffer(TypeSerializer.serialize_command(inner_command))
-        queue.unshift(inner_command)
-      else
-        result = self.serialize_primitive(command.payload[0])
-        self.insert_into_buffer(result)
-        return self.serialize_recursively(queue)
-      end
-    else
-      queue.shift
-    end
-    self.serialize_recursively(queue)
-  end
-
 end

package/Binaries/Ruby/Windows/X64/core/protocol/type_serializer.rb

@@ -3,6 +3,29 @@ require_relative '../../utils/string_encoding_mode'
 
 class TypeSerializer
 
+  def self.serialize_primitive(payload_item)
+    if payload_item.nil?
+      return TypeSerializer.serialize_nil
+    elsif [true, false].include? payload_item
+      return TypeSerializer.serialize_bool(payload_item)
+    elsif payload_item.is_a? Integer
+      if (-2 ** 31..2 ** 31).include?(payload_item)
+        return TypeSerializer.serialize_int(payload_item)
+      elsif (-2 ** 63..2 ** 63).include?(payload_item)
+        return TypeSerializer.serialize_longlong(payload_item)
+      else
+        return TypeSerializer.serialize_ullong(payload_item)
+      end
+    elsif payload_item.is_a? String
+      return TypeSerializer.serialize_string(payload_item)
+    elsif payload_item.is_a? Float
+      return TypeSerializer.serialize_double(payload_item)
+    elsif payload_item.is_a?
+    else
+      raise Exception.new("Payload not supported in command serializer")
+    end
+  end
+
   def self.serialize_command(command)
     length = [command.payload.length].pack("i").bytes
     return [Type::COMMAND] + length + [command.runtime_name, command.command_type]

package/Binaries/Ruby/Windows/X64/core/receiver/receiver.rb

@@ -1,13 +1,15 @@
 require_relative '../interpreter/interpreter'
+require_relative '../../utils/runtime_logger'
+require_relative '../protocol/command_serializer'
 
 class Receiver
   
   def initialize
-    @@interpreter = Interpreter.new
+    RuntimeLogger.print_runtime_info
   end
 
   def send_command(message_array, message_array_len)
-    @@interpreter.process(message_array, message_array_len)
+    CommandSerializer.new.serialize(Interpreter.new.process(message_array))
   end
   
   def heart_beat(message_array, message_array_len)

package/Binaries/Ruby/Windows/X64/core/transmitter/transmitter.rb

@@ -23,7 +23,7 @@ class Transmitter
   end
 
   def self.activate(license_key)
-    activation_result = TransmitterWrapper.Activate(license_key, "", "", "")
+    activation_result = TransmitterWrapper.Activate(license_key)
     if activation_result < 0
       error_message = get_native_error
       raise Exception.new "Javonet activation result: " + activation_result.to_s + ". Native error message: " + error_message

package/Binaries/Ruby/Windows/X64/core/transmitter/transmitter_wrapper.rb

@@ -25,7 +25,7 @@ module TransmitterWrapper
 
   attach_function :SendCommand, [:pointer, :int], :int
   attach_function :ReadResponse, [:pointer, :int], :int
-  attach_function :Activate, [:pointer, :pointer, :pointer, :pointer], :int
+  attach_function :Activate, [:pointer], :int
   attach_function :GetNativeError, [], :string
   attach_function :SetConfigSource, [:pointer], :int
 end

package/Binaries/Ruby/Windows/X64/utils/runtime_logger.rb

@@ -2,20 +2,28 @@ class RuntimeLogger
 
   @not_logged_yet = true
 
-  def self.get_runtime_info
+  def self.get_runtime_info(get_loaded_modules)
     begin
-      "Ruby Managed Runtime Info:\n" \
-        "Ruby Version: #{RUBY_VERSION}\n" \
-        "Ruby Implementation: #{RUBY_ENGINE}\n" \
-        "Current Directory: #{Dir.pwd}\n"
+      runtime_info = "Ruby Managed Runtime Info:\n".force_encoding('UTF-8') +
+        "Ruby Version: #{RUBY_VERSION}\n".force_encoding('UTF-8') +
+        "Ruby Implementation: #{RUBY_ENGINE}\n".force_encoding('UTF-8') +
+        "Ruby Platform: #{RUBY_PLATFORM}\n".force_encoding('UTF-8') +
+        "Ruby Engine: #{RUBY_ENGINE}\n".force_encoding('UTF-8') +
+        "Ruby Engine Version: #{RUBY_ENGINE_VERSION}\n".force_encoding('UTF-8') +
+        "Current Directory: #{Dir.pwd}\n".force_encoding('UTF-8') +
+        "Ruby search path: " + $LOAD_PATH.join(", ").force_encoding('UTF-8') + "\n"
+      if get_loaded_modules
+        runtime_info += "Ruby loaded modules (excluding Javonet classes): " + $LOADED_FEATURES.reject { |feature| feature.include?("Binaries/Ruby") }.join(", ").force_encoding('UTF-8') + "\n"
+      end
+        return runtime_info
     rescue => e
-      "Ruby Managed Runtime Info: Error while fetching runtime info"
+      "Ruby Managed Runtime Info: Error while fetching runtime info".force_encoding('UTF-8')
     end
   end
 
-  def self.print_runtime_info
+  def self.print_runtime_info(get_loaded_modules = true)
     if @not_logged_yet
-      puts get_runtime_info
+      puts get_runtime_info(get_loaded_modules)
       @not_logged_yet = false
     end
   end

package/Binaries/Ruby/Windows/X64/utils/tcp_connection_data.rb

@@ -30,4 +30,8 @@ class TcpConnectionData
   def get_port_bytes
     [@port & 0xFF, @port >> 8]
   end
+
+  def serialize_connection_data
+    [ConnectionType::TCP] + get_address_bytes + get_port_bytes
+  end
 end

package/Binaries/version.txt

@@ -1 +1 @@
-2.5.4
+2.5.5

package/addon/JavonetNodejsRuntimeAddon.cpp

@@ -144,11 +144,8 @@ void Activate(const FunctionCallbackInfo<Value>& args)
 {
 	isolate = args.GetIsolate();
 	if (
-		args.Length() != 4 ||
-		!args[0]->IsString() ||
-		!args[1]->IsString() ||
-		!args[2]->IsString() ||
-		!args[3]->IsString()
+		args.Length() != 1 ||
+		!args[0]->IsString()
 		) {
 		isolate->ThrowException(Exception::TypeError(
 			String::NewFromUtf8(isolate, "Wrong number of arguments or wrong argument types.",
@@ -157,17 +154,9 @@ void Activate(const FunctionCallbackInfo<Value>& args)
 	}
 
 	v8::String::Utf8Value licenseKeystr(isolate, args[0]);
-	v8::String::Utf8Value proxyhoststr(isolate, args[1]);
-	v8::String::Utf8Value proxyusernamestr(isolate, args[2]);
-	v8::String::Utf8Value proxypasswordstr(isolate, args[3]);
-
-
 	std::string licenseKey(*licenseKeystr);
-	std::string proxyHost(*proxyhoststr);
-	std::string proxyUserName(*proxyusernamestr);
-	std::string proxyPassword(*proxypasswordstr);
 
-	auto activationResult = ActivateNative_Fn(licenseKey.c_str(), proxyHost.c_str(), proxyUserName.c_str(), proxyPassword.c_str());
+	auto activationResult = ActivateNative_Fn(licenseKey.c_str());
 	args.GetReturnValue().Set(activationResult);
 	if (activationResult < 0) {
 		const char* errorMessage = GetNativeErrorNative_Fn();

package/addon/JavonetNodejsRuntimeAddon.h

@@ -49,7 +49,7 @@ int responseArrayLen{ 0 };
 
 typedef int(*SendCommandNative)(byte*, int);
 typedef int(*ReadResponseNative)(byte*, int);
-typedef int(*ActivateNative)(const char*, const char*, const char*, const char*);
+typedef int(*ActivateNative)(const char*);
 typedef const char*(*GetNativeErrorNative)();
 typedef int(*SetConfigSourceNative)(const char*);
 

package/lib/core/transmitter/Transmitter.js

@@ -2,12 +2,16 @@ const wrapper = require('./TransmitterWrapper')
 
 class Transmitter {
 
+    static initialize() {
+        return wrapper.initialize()
+    }
+
    static sendCommand(messageArray) {
         return wrapper.sendCommand(messageArray)
     }
 
-    static activate = function(licenseKey = "") {
-        return wrapper.activate(licenseKey, "", "", "")
+    static activate = function(licenseKey) {
+        return wrapper.activate(licenseKey)
     }
 
     static setConfigSource(configSource) {

package/lib/core/transmitter/TransmitterWrapper.js

@@ -12,9 +12,8 @@ class TransmitterWrapper {
         return library.initializeTransmitter(binariesRootPath)
     }
 
-    static activate(licenseKey, proxyHost, proxyUserName, proxyUserPassword) {
-        this.initialize()
-        return library.activate(licenseKey, proxyHost, proxyUserName, proxyUserPassword)
+    static activate(licenseKey) {
+        return library.activate(licenseKey)
     }
 
     static sendCommand(messageArray) {
@@ -22,7 +21,7 @@ class TransmitterWrapper {
     }
 
     static setConfigSource(configSource) {
-        //return library.setConfigSource(configSource)
+        return library.setConfigSource(configSource)
     }
 }
 

package/lib/sdk/ConfigRuntimeFactory.js

@@ -5,6 +5,7 @@ const RuntimeNameHandler = require("../utils/RuntimeNameHandler")
 const InMemoryConnectionData = require("../utils/connectionData/InMemoryConnectionData");
 const TcpConnectionData = require("../utils/connectionData/TcpConnectionData")
 const WsConnectionData = require("../utils/connectionData/WsConnectionData")
+const Transmitter = require("../core/transmitter/Transmitter");
 
 
 
@@ -16,6 +17,7 @@ const WsConnectionData = require("../utils/connectionData/WsConnectionData")
 class ConfigRuntimeFactory {
     constructor(path) {
         this.path = path
+        Transmitter.setConfigSource(path)
     }
 
     /**

package/lib/sdk/Javonet.js

@@ -9,7 +9,7 @@ const RuntimeLogger = require("../utils/RuntimeLogger");
 
 
 //static constructor not supported in nodeJS 12.20
-RuntimeLogger.printRuntimeInfo()
+Transmitter.initialize()
 //SDKExceptionHelper.sendExceptionToAppInsights("SdkMessage", "Javonet SDK initialized");
 
 
@@ -58,7 +58,6 @@ class Javonet {
      */
     static withConfig(configPath) {
         try {
-            Transmitter.setConfigSource(configPath);
             return new ConfigRuntimeFactory(configPath);
         } catch (error) {
             //SDKExceptionHelper.sendExceptionToAppInsights(error, "unknown");
@@ -81,6 +80,10 @@ class Javonet {
         }
 
     }
+
+    static getRuntimeInfo() {
+        return RuntimeLogger.getRuntimeInfo()
+    }
 }
 
 module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "javonet-nodejs-sdk",
-  "version": "2.5.4",
+  "version": "2.5.5",
   "description": "Javonet allows you to reference and use modules or packages written in (Java/Kotlin/Groovy/Clojure, C#/VB.NET, Ruby, Perl, Python, JavaScript/TypeScript) like they were created in your technology. It works on Linux/Windows and MacOS for applications created in JVM, CLR/Netcore, Perl, Python, Ruby, NodeJS, C++ or GoLang and gives you unparalleled freedom and flexibility with native performance in building your mixed-technologies products. Let it be accessing best AI or cryptography libraries, devices SDKs, legacy client modules, internal custom packages or anything from public repositories available on NPM, Nuget, PyPI, Maven/Gradle, RubyGems or GitHub. Get free from programming languages barriers today! For more information check out our guides at https://www.javonet.com/guides/v2/",
   "main": "lib/sdk/Javonet.js",
   "keywords": [],

package/Binaries/Perl/Linux/X64/deps/lib/perl5/x86_64-linux-gnu-thread-multi/.meta/Nice-Try-v1.3.13/install.json

@@ -1 +0,0 @@
-{"name":"Nice::Try","version":"1.003013","dist":"Nice-Try-v1.3.13","target":"Nice::Try","pathname":"J/JD/JDEGUEST/Nice-Try-v1.3.13.tar.gz","provides":{"Nice::Try":{"file":"lib/Nice/Try.pm","version":"1.003013"}}}

package/Binaries/Perl/Windows/X64/deps/lib/perl5/MSWin32-x64-multi-thread/.meta/Nice-Try-v1.3.13/install.json

@@ -1 +0,0 @@
-{"dist":"Nice-Try-v1.3.13","version":"1.003013","target":"Nice::Try","name":"Nice::Try","provides":{"Nice::Try":{"version":"1.003013","file":"lib/Nice/Try.pm"}},"pathname":"J/JD/JDEGUEST/Nice-Try-v1.3.13.tar.gz"}