javonet-nodejs-sdk 2.1.3 → 2.1.5

package/Binaries/Python/Windows/X64/javonet/utils/Command.py

@@ -21,7 +21,7 @@ class Command:
 
     @staticmethod
     def create_array_response(array, runtime_name):
-        return Command(runtime_name, CommandType.ArrayReference, [array])
+        return Command(runtime_name, CommandType.Array, array)
 
     def drop_first_payload_argument(self):
         payload_args = []
@@ -34,7 +34,7 @@ class Command:
         merged_payload = self.payload + [argument]
         return Command(self.runtime_name, self.command_type, merged_payload)
 
-    def append_arg_to_payload(self, current_command):
+    def prepend_arg_to_payload(self, current_command):
         if current_command is None:
             return Command(self.runtime_name, self.command_type, self.payload)
         else:

package/Binaries/Python/Windows/X64/javonet/utils/CommandType.py

@@ -26,3 +26,4 @@ class CommandType(Enum):
     ArrayGetRank = 21
     ArraySetItem = 22
     Array = 23
+    RetrieveArray = 24

package/Binaries/Ruby/Linux/X64/core/handler/command_handler/array_handler.rb

@@ -3,8 +3,8 @@ require_relative 'abstract_command_handler'
 class ArrayHandler < AbstractCommandHandler
   def process(command)
     begin
-      array = command.payload
-      return array
+      processedArray = command.payload
+      return processedArray
     rescue Exception => e
       return e
     end

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

@@ -68,15 +68,19 @@ class Handler < AbstractHandler
 
 
   def handle_command(command)
+    if command.command_type == CommandType::RETRIEVE_ARRAY
+      response_array = $handler_dict[CommandType::REFERENCE].handle_command(command.payload[0])
+      return Command.create_array_response(response_array, command.runtime_name)
+    end
     response = $handler_dict[command.command_type].handle_command(command)
       if is_response_simple_type(response)
-        return command.create_response(response)
+        return Command.create_response(response, command.runtime_name)
       elsif response.is_a? Exception
         return ExceptionSerializer.serialize_exception(response, command)
       else
         reference_cache = ReferencesCache.instance
         guid = reference_cache.cache_reference(response)
-        return command.create_reference(guid)
+        return Command.create_reference(guid, command.runtime_name)
       end
   end
 

package/Binaries/Ruby/Linux/X64/utils/command.rb

@@ -20,6 +20,42 @@ class Command
     @payload
   end
 
+
+  def self.create_response(response, runtime_name)
+    return Command.new(runtime_name, CommandType::VALUE, [response])
+  end
+
+  def self.create_reference(guid, runtime_name)
+    return Command.new(runtime_name, CommandType::REFERENCE, [guid])
+  end
+
+  def self.create_array_response(array, runtime_name)
+    return Command.new(runtime_name, CommandType::ARRAY, array)
+  end
+
+  def drop_first_payload_argument
+    payload_args = []
+    payload_args = payload_args + @payload
+    if payload_args.length != 0
+      payload_args.delete_at(0)
+    end
+    return Command.new(@runtime_name, @command_type, payload_args)
+  end
+
+  def add_arg_to_payload(argument)
+    merged_payload = payload + [argument]
+    return Command.new(@runtime_name, @command_type, merged_payload)
+  end
+
+  def prepend_arg_to_payload(current_command)
+    if current_command.nil?
+      return Command.new(@runtime_name, @command_type, @payload)
+    else
+      merged_payload = [current_command] + payload
+      return Command.new(@runtime_name, @command_type, merged_payload)
+    end
+  end
+
   def to_string
     'Runtime Library: ' + RuntimeName.get_name(@runtime_name).to_s + ' ' + 'Ruby command type: ' + CommandType.get_name(@command_type).to_s + ' ' + 'with parameters: ' + @payload.to_s
   end
@@ -53,39 +89,4 @@ class Command
     return @is_equal
   end
 
-  def create_response(response)
-    return Command.new(@runtime_name, CommandType::VALUE, [response])
-  end
-
-  def create_reference(guid)
-    return Command.new(@runtime_name, CommandType::REFERENCE, [guid])
-  end
-
-  def create_array_response(array)
-    return Command.new(@runtime_name, CommandType::ARRAY_REFERENCE, [array])
-  end
-
-  def drop_first_payload_argument
-    payload_args = []
-    payload_args = payload_args + @payload
-    if payload_args.length != 0
-      payload_args.delete_at(0)
-    end
-    return Command.new(@runtime_name, @command_type, payload_args)
-  end
-
-  def add_arg_to_payload(argument)
-    merged_payload = payload + [argument]
-    return Command.new(@runtime_name, @command_type, merged_payload)
-  end
-
-  def add_arg_to_payload_on_beginning(current_command)
-    if current_command.nil?
-      return Command.new(@runtime_name, @command_type, @payload)
-    else
-      merged_payload = [current_command] + payload
-      return Command.new(@runtime_name, @command_type, merged_payload)
-    end
-  end
-
 end

package/Binaries/Ruby/Linux/X64/utils/command_type.rb

@@ -23,6 +23,7 @@ class CommandType
   ARRAY_GET_RANK = 21
   ARRAY_SET_ITEM = 22
   ARRAY = 23
+  RETRIEVE_ARRAY = 24
 
   def self.get_name(command_number)
     case command_number
@@ -74,6 +75,8 @@ class CommandType
       return 'ARRAY_SET_ITEM'
     when 23
       return 'ARRAY'
+    when 24
+      return 'RETRIEVE_ARRAY'
     end
   end
 end

package/Binaries/Ruby/MacOs/X64/core/handler/command_handler/array_handler.rb

@@ -3,8 +3,8 @@ require_relative 'abstract_command_handler'
 class ArrayHandler < AbstractCommandHandler
   def process(command)
     begin
-      array = command.payload
-      return array
+      processedArray = command.payload
+      return processedArray
     rescue Exception => e
       return e
     end

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

@@ -68,15 +68,19 @@ class Handler < AbstractHandler
 
 
   def handle_command(command)
+    if command.command_type == CommandType::RETRIEVE_ARRAY
+      response_array = $handler_dict[CommandType::REFERENCE].handle_command(command.payload[0])
+      return Command.create_array_response(response_array, command.runtime_name)
+    end
     response = $handler_dict[command.command_type].handle_command(command)
       if is_response_simple_type(response)
-        return command.create_response(response)
+        return Command.create_response(response, command.runtime_name)
       elsif response.is_a? Exception
         return ExceptionSerializer.serialize_exception(response, command)
       else
         reference_cache = ReferencesCache.instance
         guid = reference_cache.cache_reference(response)
-        return command.create_reference(guid)
+        return Command.create_reference(guid, command.runtime_name)
       end
   end
 

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

@@ -20,6 +20,42 @@ class Command
     @payload
   end
 
+
+  def self.create_response(response, runtime_name)
+    return Command.new(runtime_name, CommandType::VALUE, [response])
+  end
+
+  def self.create_reference(guid, runtime_name)
+    return Command.new(runtime_name, CommandType::REFERENCE, [guid])
+  end
+
+  def self.create_array_response(array, runtime_name)
+    return Command.new(runtime_name, CommandType::ARRAY, array)
+  end
+
+  def drop_first_payload_argument
+    payload_args = []
+    payload_args = payload_args + @payload
+    if payload_args.length != 0
+      payload_args.delete_at(0)
+    end
+    return Command.new(@runtime_name, @command_type, payload_args)
+  end
+
+  def add_arg_to_payload(argument)
+    merged_payload = payload + [argument]
+    return Command.new(@runtime_name, @command_type, merged_payload)
+  end
+
+  def prepend_arg_to_payload(current_command)
+    if current_command.nil?
+      return Command.new(@runtime_name, @command_type, @payload)
+    else
+      merged_payload = [current_command] + payload
+      return Command.new(@runtime_name, @command_type, merged_payload)
+    end
+  end
+
   def to_string
     'Runtime Library: ' + RuntimeName.get_name(@runtime_name).to_s + ' ' + 'Ruby command type: ' + CommandType.get_name(@command_type).to_s + ' ' + 'with parameters: ' + @payload.to_s
   end
@@ -53,39 +89,4 @@ class Command
     return @is_equal
   end
 
-  def create_response(response)
-    return Command.new(@runtime_name, CommandType::VALUE, [response])
-  end
-
-  def create_reference(guid)
-    return Command.new(@runtime_name, CommandType::REFERENCE, [guid])
-  end
-
-  def create_array_response(array)
-    return Command.new(@runtime_name, CommandType::ARRAY_REFERENCE, [array])
-  end
-
-  def drop_first_payload_argument
-    payload_args = []
-    payload_args = payload_args + @payload
-    if payload_args.length != 0
-      payload_args.delete_at(0)
-    end
-    return Command.new(@runtime_name, @command_type, payload_args)
-  end
-
-  def add_arg_to_payload(argument)
-    merged_payload = payload + [argument]
-    return Command.new(@runtime_name, @command_type, merged_payload)
-  end
-
-  def add_arg_to_payload_on_beginning(current_command)
-    if current_command.nil?
-      return Command.new(@runtime_name, @command_type, @payload)
-    else
-      merged_payload = [current_command] + payload
-      return Command.new(@runtime_name, @command_type, merged_payload)
-    end
-  end
-
 end

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

@@ -23,6 +23,7 @@ class CommandType
   ARRAY_GET_RANK = 21
   ARRAY_SET_ITEM = 22
   ARRAY = 23
+  RETRIEVE_ARRAY = 24
 
   def self.get_name(command_number)
     case command_number
@@ -74,6 +75,8 @@ class CommandType
       return 'ARRAY_SET_ITEM'
     when 23
       return 'ARRAY'
+    when 24
+      return 'RETRIEVE_ARRAY'
     end
   end
 end

package/Binaries/Ruby/Windows/X64/core/handler/command_handler/array_handler.rb

@@ -3,8 +3,8 @@ require_relative 'abstract_command_handler'
 class ArrayHandler < AbstractCommandHandler
   def process(command)
     begin
-      array = command.payload
-      return array
+      processedArray = command.payload
+      return processedArray
     rescue Exception => e
       return e
     end

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

@@ -68,15 +68,19 @@ class Handler < AbstractHandler
 
 
   def handle_command(command)
+    if command.command_type == CommandType::RETRIEVE_ARRAY
+      response_array = $handler_dict[CommandType::REFERENCE].handle_command(command.payload[0])
+      return Command.create_array_response(response_array, command.runtime_name)
+    end
     response = $handler_dict[command.command_type].handle_command(command)
       if is_response_simple_type(response)
-        return command.create_response(response)
+        return Command.create_response(response, command.runtime_name)
       elsif response.is_a? Exception
         return ExceptionSerializer.serialize_exception(response, command)
       else
         reference_cache = ReferencesCache.instance
         guid = reference_cache.cache_reference(response)
-        return command.create_reference(guid)
+        return Command.create_reference(guid, command.runtime_name)
       end
   end
 

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

@@ -20,6 +20,42 @@ class Command
     @payload
   end
 
+
+  def self.create_response(response, runtime_name)
+    return Command.new(runtime_name, CommandType::VALUE, [response])
+  end
+
+  def self.create_reference(guid, runtime_name)
+    return Command.new(runtime_name, CommandType::REFERENCE, [guid])
+  end
+
+  def self.create_array_response(array, runtime_name)
+    return Command.new(runtime_name, CommandType::ARRAY, array)
+  end
+
+  def drop_first_payload_argument
+    payload_args = []
+    payload_args = payload_args + @payload
+    if payload_args.length != 0
+      payload_args.delete_at(0)
+    end
+    return Command.new(@runtime_name, @command_type, payload_args)
+  end
+
+  def add_arg_to_payload(argument)
+    merged_payload = payload + [argument]
+    return Command.new(@runtime_name, @command_type, merged_payload)
+  end
+
+  def prepend_arg_to_payload(current_command)
+    if current_command.nil?
+      return Command.new(@runtime_name, @command_type, @payload)
+    else
+      merged_payload = [current_command] + payload
+      return Command.new(@runtime_name, @command_type, merged_payload)
+    end
+  end
+
   def to_string
     'Runtime Library: ' + RuntimeName.get_name(@runtime_name).to_s + ' ' + 'Ruby command type: ' + CommandType.get_name(@command_type).to_s + ' ' + 'with parameters: ' + @payload.to_s
   end
@@ -53,39 +89,4 @@ class Command
     return @is_equal
   end
 
-  def create_response(response)
-    return Command.new(@runtime_name, CommandType::VALUE, [response])
-  end
-
-  def create_reference(guid)
-    return Command.new(@runtime_name, CommandType::REFERENCE, [guid])
-  end
-
-  def create_array_response(array)
-    return Command.new(@runtime_name, CommandType::ARRAY_REFERENCE, [array])
-  end
-
-  def drop_first_payload_argument
-    payload_args = []
-    payload_args = payload_args + @payload
-    if payload_args.length != 0
-      payload_args.delete_at(0)
-    end
-    return Command.new(@runtime_name, @command_type, payload_args)
-  end
-
-  def add_arg_to_payload(argument)
-    merged_payload = payload + [argument]
-    return Command.new(@runtime_name, @command_type, merged_payload)
-  end
-
-  def add_arg_to_payload_on_beginning(current_command)
-    if current_command.nil?
-      return Command.new(@runtime_name, @command_type, @payload)
-    else
-      merged_payload = [current_command] + payload
-      return Command.new(@runtime_name, @command_type, merged_payload)
-    end
-  end
-
 end

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

@@ -23,6 +23,7 @@ class CommandType
   ARRAY_GET_RANK = 21
   ARRAY_SET_ITEM = 22
   ARRAY = 23
+  RETRIEVE_ARRAY = 24
 
   def self.get_name(command_number)
     case command_number
@@ -74,6 +75,8 @@ class CommandType
       return 'ARRAY_SET_ITEM'
     when 23
       return 'ARRAY'
+    when 24
+      return 'RETRIEVE_ARRAY'
     end
   end
 end

package/addon/JavonetNodejsRuntimeAddon.cpp

@@ -38,14 +38,14 @@ void InitializeTransmitter(const FunctionCallbackInfo<Value>& args) {
 
 #if defined(__linux__)
 	nativeLibFullPath = nodeJsAddonPath + "/Binaries/Native/Linux/X64/libJavonetNodejsRuntimeNative.so";
-	nodejsSharedLibFullPath = nodeJsAddonPath + "/Binaries/Native/Linux/X64/libnode.so.72";
+	nodejsSharedLibFullPath = nodeJsAddonPath + "/Binaries/Native/Linux/X64/libnode.so.108";
 
 	NodeJsSharedLibInstance = dlopen(nodejsSharedLibFullPath.c_str(), RTLD_LAZY);
 	char* error = dlerror();
 	if (NodeJsSharedLibInstance == NULL || error != NULL) {
 		char errorMessage[300];
 
-		sprintf(errorMessage, "%s %s \n%s %s", "libnode.so.72 not found in: ", nodejsSharedLibFullPath.c_str(), "Error: ", error);
+		sprintf(errorMessage, "%s %s \n%s %s", "libnode.so.108 not found in: ", nodejsSharedLibFullPath.c_str(), "Error: ", error);
 		isolate->ThrowException(Exception::Error(
 			String::NewFromUtf8(isolate, errorMessage,
 				NewStringType::kNormal).ToLocalChecked()));
@@ -65,14 +65,14 @@ void InitializeTransmitter(const FunctionCallbackInfo<Value>& args) {
 #endif	//__linux__
 #if defined(__APPLE__)
 	nativeLibFullPath = nodeJsAddonPath + "/Binaries/Native/MacOs/X64/libJavonetNodejsRuntimeNative.dylib";
-	nodejsSharedLibFullPath = nodeJsAddonPath + "/Binaries/Native/MacOs/X64/libnode.72.dylib";
+	nodejsSharedLibFullPath = nodeJsAddonPath + "/Binaries/Native/MacOs/X64/libnode.108.dylib";
 
 	NodeJsSharedLibInstance = dlopen(nodejsSharedLibFullPath.c_str(), RTLD_LAZY);
 	char* error = dlerror();
 	if (NodeJsSharedLibInstance == NULL || error != NULL) {
 		char errorMessage[300];
 
-		sprintf(errorMessage, "%s %s \n%s %s", "libnode.72.dylib not found in: ", nodejsSharedLibFullPath.c_str(), "Error: ", error);
+		sprintf(errorMessage, "%s %s \n%s %s", "libnode.108.dylib not found in: ", nodejsSharedLibFullPath.c_str(), "Error: ", error);
 		isolate->ThrowException(Exception::Error(
 			String::NewFromUtf8(isolate, errorMessage,
 				NewStringType::kNormal).ToLocalChecked()));

package/lib/core/handler/ArrayHandler.js

@@ -4,8 +4,8 @@ const AbstractHandler = require("./AbstractHandler")
 class ArrayHandler extends AbstractHandler {
     process(command) {
         try {
-            let array = command.payload
-            return array
+            let processedArray = command.payload
+            return processedArray
         } catch (error) {
             return this.process_stack_trace(error, this.constructor.name)
         }

package/lib/core/handler/Handler.js

@@ -29,10 +29,6 @@ function isResponseSimpleType(response) {
     return ['string', 'boolean', 'number'].includes(type)
 }
 
-function isResponseArray(response) {
-    return response instanceof Array
-}
-
 function isResponseError(response) {
     return response instanceof Error
 }
@@ -59,8 +55,11 @@ const handlers = {
 }
 
 class Handler {
-
     handleCommand(command) {
+            if (command.commandType == CommandType.RetrieveArray) {
+                let responseArray = handlers[CommandType.Reference].handleCommand(command.payload[0])
+                return Command.createArrayResponse(responseArray, command.runtimeName)
+            }
             let response = handlers[command.commandType].handleCommand(command)
             if(isResponseError(response)) {
                 return ExceptionSerializer.serializeException(response, command)

package/lib/sdk/internal/InvocationContext.js

@@ -111,6 +111,13 @@ class InvocationContext {
         return new InvocationContext(this.#runtime, this.#connectionType, this.#tcpAddress, this.#buildCommand(localCommand))
     }
 
+    retrieveArray(...args) {
+        let localCommand = new Command(this.#runtime, CommandType.RetrieveArray, args)
+        let localInvCtx = new InvocationContext(this.#runtime, this.#connectionType, this.#tcpAddress, this.#buildCommand(localCommand))
+        localInvCtx.execute()
+        return localInvCtx.#responseCommand.payload
+    }
+
     getValue() {
         this.#resultValue = this.#currentCommand.payload[0]
         return this.#resultValue;
@@ -120,7 +127,7 @@ class InvocationContext {
         for (let i = 0; i < command.payload.length; i++) {
             command.payload[i] = this.#encapsulatePayloadItem(command.payload[i])
         }
-        return command.appendArgument(this.#currentCommand);
+        return command.prependArgToPayload(this.#currentCommand);
     }
 
     #encapsulatePayloadItem = function (payloadItem) {

package/lib/sdk/internal/RuntimeContext.js

@@ -70,6 +70,12 @@ class RuntimeContext {
         return new InvocationContext(this.runtimeName, this.connectionType, this.tcpConnectionData, this.#buildCommand(localCommand))
     }
 
+    cast(targetType, value) {
+        let localCommand = new Command(this.runtimeName, CommandType.Cast, [targetType, value])
+        this.#currentCommand = null
+        return new InvocationContext(this.runtimeName, this.connectionType, this.tcpConnectionData, this.#buildCommand(localCommand))
+    }
+
     invokeGlobalMethod(...args) {
         let localCommand = new Command(this.runtimeName, CommandType.InvokeGlobalMethod, args)
         this.#currentCommand = null
@@ -88,7 +94,7 @@ class RuntimeContext {
         for (let i = 0; i < command.payload.length; i++) {
             command.payload[i] = this.#encapsulatePayloadItem(command.payload[i])
         }
-        return command.appendArgument(this.#currentCommand)
+        return command.prependArgToPayload(this.#currentCommand)
     }
 
     #encapsulatePayloadItem = function (payloadItem) {

package/lib/utils/Command.js

@@ -26,8 +26,8 @@ class Command {
     static createArrayResponse(response, runtimeName) {
         return new Command(
             runtimeName,
-            CommandType.ArrayReference,
-            [response]
+            CommandType.Array,
+            response
         )
     }
 
@@ -47,7 +47,7 @@ class Command {
         )
     }
 
-    appendArgument(current_command) {
+    prependArgToPayload(current_command) {
         if (current_command == null) {
             return new Command(
                 this.runtimeName,

package/lib/utils/CommandType.js

@@ -22,5 +22,6 @@ module.exports = {
     ArrayGetSize: 20,
     ArrayGetRank: 21,
     ArraySetItem: 22,
-    Array: 23
+    Array: 23,
+    RetrieveArray: 24
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "javonet-nodejs-sdk",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "description": "Javonet SDK for NodeJS",
   "main": "lib/Javonet.js",
   "keywords": [],

package/Binaries/Nodejs/Linux/X64/utils/ExplicitCast.js

@@ -1,20 +0,0 @@
-const Command = require('./Command')
-const CommandType = require('./CommandType')
-class ExplicitCast {
-  static cast(value, targetType) {
-      return new Command(
-            100,
-            CommandType.Cast,
-            [
-                value,
-                new Command(
-                    100,
-                    CommandType.GetType,
-                    [targetType]
-                )
-            ]
-      )
-  }
-}
-
-module.exports = ExplicitCast