javonet-nodejs-sdk 2.5.7 → 2.5.8

package/Binaries/Python/javonet/utils/RuntimeLogger.py

@@ -17,7 +17,7 @@ class RuntimeLogger:
                 f"Python Implementation: {platform.python_implementation()}\n"
                 f"OS Version: {platform.system()} {platform.version()}\n"
                 f"Process Architecture: {platform.machine()}\n"
-                f"Current Directory: {os.getcwd()}\n"
+                f"Current Working Directory: {os.getcwd()}\n"
             )
         except Exception as e:
             return "Python Managed Runtime Info: Error while fetching runtime info"

package/Binaries/Ruby/Linux/X64/core/handler/get_instance_field_handler.rb

@@ -19,14 +19,14 @@ class GetInstanceFieldHandler < AbstractCommandHandler
       if command.payload[0].instance_variable_defined?(merged_value)
         response = command.payload[0].instance_variable_get(merged_value)
       else
-        raise "Instance field not defined"
+        raise Exception
       end
       return response
-    rescue NameError
+    rescue Exception => e
       fields = command.payload[0].instance_variables
       message = "Field #{command.payload[1]} not found in object of class #{command.payload[0].class.name}. Available fields:\n"
       fields.each { |field_iter| message += "#{field_iter}\n" }
-      raise Exception, message
+      raise ArgumentError, message
     rescue Exception => e
       return e
     end

package/Binaries/Ruby/Linux/X64/core/handler/get_static_field_handler.rb

@@ -22,11 +22,11 @@ class GetStaticFieldHandler < AbstractCommandHandler
         response = command.payload[0].const_get(command.payload[1])
       end
       return response
-    rescue NameError
+    rescue Exception
       fields = command.payload[0].class_variables
       message = "Field #{command.payload[1]} not found in class #{command.payload[0].name}. Available fields:\n"
       fields.each { |field_iter| message += "#{field_iter}\n" }
-      raise Exception, message
+      raise ArgumentError, message
     rescue Exception => e
       return e
     end

package/Binaries/Ruby/Linux/X64/core/handler/get_type_handler.rb

@@ -18,7 +18,7 @@ class GetTypeHandler < AbstractCommandHandler
       type_to_return = _get_type_from_payload(command)
 
       if type_to_return.nil?
-        raise "Type #{command.payload[0]} not found"
+        raise "Type #{command.payload[0]} not found.\n"
       end
 
       if (@namespace_cache.is_namespace_cache_empty? && @type_cache.is_type_cache_empty?) || # both caches are empty
@@ -33,27 +33,38 @@ class GetTypeHandler < AbstractCommandHandler
 
       type_to_return
     rescue Exception => e
-      return e
+      begin
+        message = e.message
+        message += "\nLoaded libraries:\n"
+        loaded_libraries = LoadLibraryHandler.get_loaded_libraries
+        # find types in loaded libraries
+        loaded_libraries.each do |library|
+          message += "#{library}\n"
+        end
+        raise ArgumentError, message
+      rescue Exception => e
+        return e
+      end
     end
-end
+  end
 
-    private
+  private
 
-    def _get_type_from_payload(command)
-      if command.payload.length == 1
-        type_name = command.payload[0].split("::")
-        if type_name.length == 1
-          return Object::const_get(type_name[0])
-        else
-          return _get_type_from_nested_payload(type_name)
-        end
+  def _get_type_from_payload(command)
+    if command.payload.length == 1
+      type_name = command.payload[0].split("::")
+      if type_name.length == 1
+        return Object::const_get(type_name[0])
       else
-        return _get_type_from_nested_payload(command.payload)
+        return _get_type_from_nested_payload(type_name)
       end
+    else
+      return _get_type_from_nested_payload(command.payload)
     end
+  end
 
-    def _get_type_from_nested_payload(payload)
-      loaded_module = Object::const_get(payload[0..-2].join("::"))
-      loaded_module.const_get(payload[-1])
-    end
-  end
+  def _get_type_from_nested_payload(payload)
+    loaded_module = Object::const_get(payload[0..-2].join("::"))
+    loaded_module.const_get(payload[-1])
+  end
+end

package/Binaries/Ruby/Linux/X64/core/handler/load_library_handler.rb

@@ -1,6 +1,9 @@
 require_relative 'abstract_command_handler'
 
 class LoadLibraryHandler < AbstractCommandHandler
+
+  @@loaded_libraries = []
+
   def initialize
     @required_parameters_count = 1
   end
@@ -17,9 +20,14 @@ class LoadLibraryHandler < AbstractCommandHandler
       end
       #noinspection RubyResolve
       require(assembly_name)
+      @@loaded_libraries.push(assembly_name)
       return 0
     rescue Exception => e
       return e
     end
   end
+
+  def self.get_loaded_libraries
+    @@loaded_libraries
+  end
 end

package/Binaries/Ruby/Linux/X64/core/handler/set_instance_field_handler.rb

@@ -17,12 +17,16 @@ class SetInstanceFieldHandler < AbstractCommandHandler
   
       merged_value = '@' + command.payload[1]
       begin
-        command.payload[0].instance_variable_set(merged_value, command.payload[2])
-      rescue NameError
+        if command.payload[0].instance_variable_defined?(merged_value)
+          command.payload[0].instance_variable_set(merged_value, command.payload[2])
+        else
+          raise Exception
+        end
+      rescue Exception
         fields = command.payload[0].instance_variables
         message = "Field #{command.payload[1]} not found in class #{command.payload[0].class.name}. Available fields:\n"
         fields.each { |field_iter| message += "#{field_iter} \n" }
-        raise Exception, message
+        raise ArgumentError, message
       end
     rescue Exception => e
       return e

package/Binaries/Ruby/Linux/X64/core/handler/set_static_field_handler.rb

@@ -18,11 +18,11 @@ class SetStaticFieldHandler < AbstractCommandHandler
       merged_value = '@@' + command.payload[1]
       begin
         command.payload[0].class_variable_set(merged_value, command.payload[2])
-      rescue NameError
+      rescue Exception
         fields = command.payload[0].class_variables
         message = "Field #{command.payload[1]} not found in class #{command.payload[0].name}. Available fields:\n"
         fields.each { |field_iter| message += "#{field_iter}\n" }
-        raise Exception, message
+        raise ArgumentError, message
       end
     rescue Exception => e
       return e

package/Binaries/Ruby/MacOs/X64/core/handler/get_instance_field_handler.rb

@@ -19,14 +19,14 @@ class GetInstanceFieldHandler < AbstractCommandHandler
       if command.payload[0].instance_variable_defined?(merged_value)
         response = command.payload[0].instance_variable_get(merged_value)
       else
-        raise "Instance field not defined"
+        raise Exception
       end
       return response
-    rescue NameError
+    rescue Exception => e
       fields = command.payload[0].instance_variables
       message = "Field #{command.payload[1]} not found in object of class #{command.payload[0].class.name}. Available fields:\n"
       fields.each { |field_iter| message += "#{field_iter}\n" }
-      raise Exception, message
+      raise ArgumentError, message
     rescue Exception => e
       return e
     end

package/Binaries/Ruby/MacOs/X64/core/handler/get_static_field_handler.rb

@@ -22,11 +22,11 @@ class GetStaticFieldHandler < AbstractCommandHandler
         response = command.payload[0].const_get(command.payload[1])
       end
       return response
-    rescue NameError
+    rescue Exception
       fields = command.payload[0].class_variables
       message = "Field #{command.payload[1]} not found in class #{command.payload[0].name}. Available fields:\n"
       fields.each { |field_iter| message += "#{field_iter}\n" }
-      raise Exception, message
+      raise ArgumentError, message
     rescue Exception => e
       return e
     end

package/Binaries/Ruby/MacOs/X64/core/handler/get_type_handler.rb

@@ -18,7 +18,7 @@ class GetTypeHandler < AbstractCommandHandler
       type_to_return = _get_type_from_payload(command)
 
       if type_to_return.nil?
-        raise "Type #{command.payload[0]} not found"
+        raise "Type #{command.payload[0]} not found.\n"
       end
 
       if (@namespace_cache.is_namespace_cache_empty? && @type_cache.is_type_cache_empty?) || # both caches are empty
@@ -33,27 +33,38 @@ class GetTypeHandler < AbstractCommandHandler
 
       type_to_return
     rescue Exception => e
-      return e
+      begin
+        message = e.message
+        message += "\nLoaded libraries:\n"
+        loaded_libraries = LoadLibraryHandler.get_loaded_libraries
+        # find types in loaded libraries
+        loaded_libraries.each do |library|
+          message += "#{library}\n"
+        end
+        raise ArgumentError, message
+      rescue Exception => e
+        return e
+      end
     end
-end
+  end
 
-    private
+  private
 
-    def _get_type_from_payload(command)
-      if command.payload.length == 1
-        type_name = command.payload[0].split("::")
-        if type_name.length == 1
-          return Object::const_get(type_name[0])
-        else
-          return _get_type_from_nested_payload(type_name)
-        end
+  def _get_type_from_payload(command)
+    if command.payload.length == 1
+      type_name = command.payload[0].split("::")
+      if type_name.length == 1
+        return Object::const_get(type_name[0])
       else
-        return _get_type_from_nested_payload(command.payload)
+        return _get_type_from_nested_payload(type_name)
       end
+    else
+      return _get_type_from_nested_payload(command.payload)
     end
+  end
 
-    def _get_type_from_nested_payload(payload)
-      loaded_module = Object::const_get(payload[0..-2].join("::"))
-      loaded_module.const_get(payload[-1])
-    end
-  end
+  def _get_type_from_nested_payload(payload)
+    loaded_module = Object::const_get(payload[0..-2].join("::"))
+    loaded_module.const_get(payload[-1])
+  end
+end

package/Binaries/Ruby/MacOs/X64/core/handler/load_library_handler.rb

@@ -1,6 +1,9 @@
 require_relative 'abstract_command_handler'
 
 class LoadLibraryHandler < AbstractCommandHandler
+
+  @@loaded_libraries = []
+
   def initialize
     @required_parameters_count = 1
   end
@@ -17,9 +20,14 @@ class LoadLibraryHandler < AbstractCommandHandler
       end
       #noinspection RubyResolve
       require(assembly_name)
+      @@loaded_libraries.push(assembly_name)
       return 0
     rescue Exception => e
       return e
     end
   end
+
+  def self.get_loaded_libraries
+    @@loaded_libraries
+  end
 end

package/Binaries/Ruby/MacOs/X64/core/handler/set_instance_field_handler.rb

@@ -17,12 +17,16 @@ class SetInstanceFieldHandler < AbstractCommandHandler
   
       merged_value = '@' + command.payload[1]
       begin
-        command.payload[0].instance_variable_set(merged_value, command.payload[2])
-      rescue NameError
+        if command.payload[0].instance_variable_defined?(merged_value)
+          command.payload[0].instance_variable_set(merged_value, command.payload[2])
+        else
+          raise Exception
+        end
+      rescue Exception
         fields = command.payload[0].instance_variables
         message = "Field #{command.payload[1]} not found in class #{command.payload[0].class.name}. Available fields:\n"
         fields.each { |field_iter| message += "#{field_iter} \n" }
-        raise Exception, message
+        raise ArgumentError, message
       end
     rescue Exception => e
       return e

package/Binaries/Ruby/MacOs/X64/core/handler/set_static_field_handler.rb

@@ -18,11 +18,11 @@ class SetStaticFieldHandler < AbstractCommandHandler
       merged_value = '@@' + command.payload[1]
       begin
         command.payload[0].class_variable_set(merged_value, command.payload[2])
-      rescue NameError
+      rescue Exception
         fields = command.payload[0].class_variables
         message = "Field #{command.payload[1]} not found in class #{command.payload[0].name}. Available fields:\n"
         fields.each { |field_iter| message += "#{field_iter}\n" }
-        raise Exception, message
+        raise ArgumentError, message
       end
     rescue Exception => e
       return e

package/Binaries/Ruby/Windows/X64/core/handler/get_instance_field_handler.rb

@@ -19,14 +19,14 @@ class GetInstanceFieldHandler < AbstractCommandHandler
       if command.payload[0].instance_variable_defined?(merged_value)
         response = command.payload[0].instance_variable_get(merged_value)
       else
-        raise "Instance field not defined"
+        raise Exception
       end
       return response
-    rescue NameError
+    rescue Exception => e
       fields = command.payload[0].instance_variables
       message = "Field #{command.payload[1]} not found in object of class #{command.payload[0].class.name}. Available fields:\n"
       fields.each { |field_iter| message += "#{field_iter}\n" }
-      raise Exception, message
+      raise ArgumentError, message
     rescue Exception => e
       return e
     end

package/Binaries/Ruby/Windows/X64/core/handler/get_static_field_handler.rb

@@ -22,11 +22,11 @@ class GetStaticFieldHandler < AbstractCommandHandler
         response = command.payload[0].const_get(command.payload[1])
       end
       return response
-    rescue NameError
+    rescue Exception
       fields = command.payload[0].class_variables
       message = "Field #{command.payload[1]} not found in class #{command.payload[0].name}. Available fields:\n"
       fields.each { |field_iter| message += "#{field_iter}\n" }
-      raise Exception, message
+      raise ArgumentError, message
     rescue Exception => e
       return e
     end

package/Binaries/Ruby/Windows/X64/core/handler/get_type_handler.rb

@@ -18,7 +18,7 @@ class GetTypeHandler < AbstractCommandHandler
       type_to_return = _get_type_from_payload(command)
 
       if type_to_return.nil?
-        raise "Type #{command.payload[0]} not found"
+        raise "Type #{command.payload[0]} not found.\n"
       end
 
       if (@namespace_cache.is_namespace_cache_empty? && @type_cache.is_type_cache_empty?) || # both caches are empty
@@ -33,27 +33,38 @@ class GetTypeHandler < AbstractCommandHandler
 
       type_to_return
     rescue Exception => e
-      return e
+      begin
+        message = e.message
+        message += "\nLoaded libraries:\n"
+        loaded_libraries = LoadLibraryHandler.get_loaded_libraries
+        # find types in loaded libraries
+        loaded_libraries.each do |library|
+          message += "#{library}\n"
+        end
+        raise ArgumentError, message
+      rescue Exception => e
+        return e
+      end
     end
-end
+  end
 
-    private
+  private
 
-    def _get_type_from_payload(command)
-      if command.payload.length == 1
-        type_name = command.payload[0].split("::")
-        if type_name.length == 1
-          return Object::const_get(type_name[0])
-        else
-          return _get_type_from_nested_payload(type_name)
-        end
+  def _get_type_from_payload(command)
+    if command.payload.length == 1
+      type_name = command.payload[0].split("::")
+      if type_name.length == 1
+        return Object::const_get(type_name[0])
       else
-        return _get_type_from_nested_payload(command.payload)
+        return _get_type_from_nested_payload(type_name)
       end
+    else
+      return _get_type_from_nested_payload(command.payload)
     end
+  end
 
-    def _get_type_from_nested_payload(payload)
-      loaded_module = Object::const_get(payload[0..-2].join("::"))
-      loaded_module.const_get(payload[-1])
-    end
-  end
+  def _get_type_from_nested_payload(payload)
+    loaded_module = Object::const_get(payload[0..-2].join("::"))
+    loaded_module.const_get(payload[-1])
+  end
+end

package/Binaries/Ruby/Windows/X64/core/handler/load_library_handler.rb

@@ -1,6 +1,9 @@
 require_relative 'abstract_command_handler'
 
 class LoadLibraryHandler < AbstractCommandHandler
+
+  @@loaded_libraries = []
+
   def initialize
     @required_parameters_count = 1
   end
@@ -17,9 +20,14 @@ class LoadLibraryHandler < AbstractCommandHandler
       end
       #noinspection RubyResolve
       require(assembly_name)
+      @@loaded_libraries.push(assembly_name)
       return 0
     rescue Exception => e
       return e
     end
   end
+
+  def self.get_loaded_libraries
+    @@loaded_libraries
+  end
 end

package/Binaries/Ruby/Windows/X64/core/handler/set_instance_field_handler.rb

@@ -17,12 +17,16 @@ class SetInstanceFieldHandler < AbstractCommandHandler
   
       merged_value = '@' + command.payload[1]
       begin
-        command.payload[0].instance_variable_set(merged_value, command.payload[2])
-      rescue NameError
+        if command.payload[0].instance_variable_defined?(merged_value)
+          command.payload[0].instance_variable_set(merged_value, command.payload[2])
+        else
+          raise Exception
+        end
+      rescue Exception
         fields = command.payload[0].instance_variables
         message = "Field #{command.payload[1]} not found in class #{command.payload[0].class.name}. Available fields:\n"
         fields.each { |field_iter| message += "#{field_iter} \n" }
-        raise Exception, message
+        raise ArgumentError, message
       end
     rescue Exception => e
       return e

package/Binaries/Ruby/Windows/X64/core/handler/set_static_field_handler.rb

@@ -18,11 +18,11 @@ class SetStaticFieldHandler < AbstractCommandHandler
       merged_value = '@@' + command.payload[1]
       begin
         command.payload[0].class_variable_set(merged_value, command.payload[2])
-      rescue NameError
+      rescue Exception
         fields = command.payload[0].class_variables
         message = "Field #{command.payload[1]} not found in class #{command.payload[0].name}. Available fields:\n"
         fields.each { |field_iter| message += "#{field_iter}\n" }
-        raise Exception, message
+        raise ArgumentError, message
       end
     rescue Exception => e
       return e

package/Binaries/version.txt

@@ -1 +1 @@
-2.5.7
+2.5.8

package/lib/core/handler/GetTypeHandler.js

@@ -1,4 +1,5 @@
 const AbstractHandler = require("./AbstractHandler");
+const LoadLibraryHandler = require("./LoadLibraryHandler");
 const NamespaceCache = require("../namespaceCache/NamespaceCache");
 const TypeCache = require("../typeCache/TypeCache");
 
@@ -21,7 +22,10 @@ class GetTypeHandler extends AbstractHandler {
             typeName = typeName.replace(".js", "")
             let typeToReturn = global[typeName]
             if (typeToReturn === undefined) {
-                throw new Error(`Type ${typeName} not found`)
+                let message = `Type ${typeName} not found\n`
+                message += "Available types:\n"
+                message += this.getAvailableTypes().join("\n")
+                throw new Error(message)
             }
 
             if (
@@ -40,8 +44,19 @@ class GetTypeHandler extends AbstractHandler {
         } catch (error) {
             throw this.process_stack_trace(error, this.constructor.name)
         }
+    }
 
+    getAvailableTypes() {
+        let availableTypes = [];
+        LoadLibraryHandler.getLoadedLibraries().forEach((lib) => {
+            const moduleExports = require(lib);
+            availableTypes.push(moduleExports.name)
+            Object.keys(moduleExports).forEach((key) => {
+                availableTypes.push(key);
+            });
+        });
+        return availableTypes;
     }
 }
 
-module.exports = new GetTypeHandler()
+module.exports = new GetTypeHandler()

package/lib/core/handler/LoadLibraryHandler.js

@@ -2,6 +2,7 @@ const AbstractHandler = require('./AbstractHandler')
 
 class LoadLibraryHandler extends AbstractHandler {
     requiredParametersCount = 1
+    static loadedLibraries = [];
 
     constructor() {
         super()
@@ -21,6 +22,7 @@ class LoadLibraryHandler extends AbstractHandler {
 
         try {
             moduleExports = require(lib)
+            LoadLibraryHandler.loadedLibraries.push(lib)
         } catch (error) {
             try {
                 moduleExports = require(`${process.cwd()}/${lib}`)
@@ -36,6 +38,10 @@ class LoadLibraryHandler extends AbstractHandler {
         }
         return 0
     }
+
+    getLoadedLibraries() {
+        return LoadLibraryHandler.loadedLibraries
+    }
 }
 
 module.exports = new LoadLibraryHandler()

package/lib/core/interpreter/Interpreter.js

@@ -19,6 +19,10 @@ class Interpreter {
                 const wsClient = new WebSocketClient(connectionData.hostname, null)
 
                 const responseByteArray = await wsClient.send(messageByteArray)
+                if (!responseByteArray) {
+                    // TODO: handle error exception log?
+                    return []
+                } 
                 return new CommandDeserializer(responseByteArray).deserialize()
             }
             else {