javonet-nodejs-sdk 2.1.8 → 2.1.9

package/Binaries/Python/Linux/X64/javonet/core/transmitter/PythonTransmitterWrapper.py

@@ -47,13 +47,12 @@ class PythonTransmitterWrapper:
                 "Javonet native error code: " + str(response_array_len) + ". " + str(error_message))
 
     @staticmethod
-    def activate(email, licence_key, proxy_host, proxy_user_name, proxy_user_password):
+    def activate(licence_key, proxy_host, proxy_user_name, proxy_user_password):
         activate = PythonTransmitterWrapper.python_lib.Activate
         activate.restype = c_int
-        activate.argtypes = [c_char_p, c_char_p, c_char_p, c_char_p, c_char_p]
+        activate.argtypes = [c_char_p, c_char_p, c_char_p, c_char_p]
 
-        activation_result = activate(email.encode('ascii'),
-                                     licence_key.encode('ascii'),
+        activation_result = activate(licence_key.encode('ascii'),
                                      proxy_host.encode('ascii'),
                                      proxy_user_name.encode('ascii'),
                                      proxy_user_password.encode('ascii'))

package/Binaries/Python/MacOs/X64/javonet/core/transmitter/PythonTransmitter.py

@@ -8,17 +8,17 @@ class PythonTransmitter:
         return PythonTransmitterWrapper.send_command(message)
 
     @staticmethod
-    def __activate(email="", licence_key="", proxy_host="", proxy_user_name="", proxy_user_password=""):
-        return PythonTransmitterWrapper.activate(email, licence_key, proxy_host, proxy_user_name, proxy_user_password)
+    def __activate(licence_key="", proxy_host="", proxy_user_name="", proxy_user_password=""):
+        return PythonTransmitterWrapper.activate(licence_key, proxy_host, proxy_user_name, proxy_user_password)
 
     @staticmethod
     def activate_with_licence_file():
         return PythonTransmitter.__activate()
 
     @staticmethod
-    def activate_with_credentials(email, licence_key):
-        return PythonTransmitter.__activate(email, licence_key)
+    def activate_with_credentials(licence_key):
+        return PythonTransmitter.__activate(licence_key)
 
     @staticmethod
-    def activate_with_credentials_and_proxy(email, licence_key, proxy_host, proxy_user_name, proxy_user_password):
-        return PythonTransmitter.__activate(email, licence_key, proxy_host, proxy_user_name, proxy_user_password)
+    def activate_with_credentials_and_proxy(licence_key, proxy_host, proxy_user_name, proxy_user_password):
+        return PythonTransmitter.__activate(licence_key, proxy_host, proxy_user_name, proxy_user_password)

package/Binaries/Python/MacOs/X64/javonet/core/transmitter/PythonTransmitterWrapper.py

@@ -47,13 +47,12 @@ class PythonTransmitterWrapper:
                 "Javonet native error code: " + str(response_array_len) + ". " + str(error_message))
 
     @staticmethod
-    def activate(email, licence_key, proxy_host, proxy_user_name, proxy_user_password):
+    def activate(licence_key, proxy_host, proxy_user_name, proxy_user_password):
         activate = PythonTransmitterWrapper.python_lib.Activate
         activate.restype = c_int
-        activate.argtypes = [c_char_p, c_char_p, c_char_p, c_char_p, c_char_p]
+        activate.argtypes = [c_char_p, c_char_p, c_char_p, c_char_p]
 
-        activation_result = activate(email.encode('ascii'),
-                                     licence_key.encode('ascii'),
+        activation_result = activate(licence_key.encode('ascii'),
                                      proxy_host.encode('ascii'),
                                      proxy_user_name.encode('ascii'),
                                      proxy_user_password.encode('ascii'))

package/Binaries/Python/Windows/X64/javonet/core/transmitter/PythonTransmitter.py

@@ -8,17 +8,17 @@ class PythonTransmitter:
         return PythonTransmitterWrapper.send_command(message)
 
     @staticmethod
-    def __activate(email="", licence_key="", proxy_host="", proxy_user_name="", proxy_user_password=""):
-        return PythonTransmitterWrapper.activate(email, licence_key, proxy_host, proxy_user_name, proxy_user_password)
+    def __activate(licence_key="", proxy_host="", proxy_user_name="", proxy_user_password=""):
+        return PythonTransmitterWrapper.activate(licence_key, proxy_host, proxy_user_name, proxy_user_password)
 
     @staticmethod
     def activate_with_licence_file():
         return PythonTransmitter.__activate()
 
     @staticmethod
-    def activate_with_credentials(email, licence_key):
-        return PythonTransmitter.__activate(email, licence_key)
+    def activate_with_credentials(licence_key):
+        return PythonTransmitter.__activate(licence_key)
 
     @staticmethod
-    def activate_with_credentials_and_proxy(email, licence_key, proxy_host, proxy_user_name, proxy_user_password):
-        return PythonTransmitter.__activate(email, licence_key, proxy_host, proxy_user_name, proxy_user_password)
+    def activate_with_credentials_and_proxy(licence_key, proxy_host, proxy_user_name, proxy_user_password):
+        return PythonTransmitter.__activate(licence_key, proxy_host, proxy_user_name, proxy_user_password)

package/Binaries/Python/Windows/X64/javonet/core/transmitter/PythonTransmitterWrapper.py

@@ -47,13 +47,12 @@ class PythonTransmitterWrapper:
                 "Javonet native error code: " + str(response_array_len) + ". " + str(error_message))
 
     @staticmethod
-    def activate(email, licence_key, proxy_host, proxy_user_name, proxy_user_password):
+    def activate(licence_key, proxy_host, proxy_user_name, proxy_user_password):
         activate = PythonTransmitterWrapper.python_lib.Activate
         activate.restype = c_int
-        activate.argtypes = [c_char_p, c_char_p, c_char_p, c_char_p, c_char_p]
+        activate.argtypes = [c_char_p, c_char_p, c_char_p, c_char_p]
 
-        activation_result = activate(email.encode('ascii'),
-                                     licence_key.encode('ascii'),
+        activation_result = activate(licence_key.encode('ascii'),
                                      proxy_host.encode('ascii'),
                                      proxy_user_name.encode('ascii'),
                                      proxy_user_password.encode('ascii'))

package/Binaries/Ruby/Linux/X64/core/exceptions/exception_serializer.rb

@@ -1,6 +1,5 @@
 require_relative '../exceptions/exception_type'
 
-
 class ExceptionSerializer
 
   def self.serialize_exception(exception, command)
@@ -15,7 +14,7 @@ class ExceptionSerializer
     stack_files = ""
     stack_trace.each_with_index do |value, index|
       stack_file, stack_class, stack_line, stack_method = parse_stack_frame(value)
-      if !stack_file.include?("javonet-ruby-sdk")
+      unless stack_file.include?("javonet-ruby-sdk") or stack_file.include?("Binaries/Ruby")
         append_to_string(stack_classes, stack_class)
         append_to_string(stack_methods, stack_method)
         append_to_string(stack_lines, stack_line)
@@ -41,7 +40,7 @@ class ExceptionSerializer
     return exception_command
   end
 
-  def self.append_to_string(string,value)
+  def self.append_to_string(string, value)
     if value.nil?
       string << "undefined"
     else

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

@@ -30,16 +30,16 @@ class Transmitter
     return activate()
   end
 
-  def self.activate_with_credentials(email, licenceKey)
-    return activate(email, licenceKey)
+  def self.activate_with_credentials(licenceKey)
+    return activate(licenceKey)
   end
 
-  def self.activate_with_credentials_and_proxy(email, licenceKey, proxyHost, proxyUserName, proxyPassword)
-    return activate(email, licenceKey, proxyHost, proxyUserName, proxyPassword)
+  def self.activate_with_credentials_and_proxy(licenceKey, proxyHost, proxyUserName, proxyPassword)
+    return activate(licenceKey, proxyHost, proxyUserName, proxyPassword)
   end
 
-  private_class_method def self.activate(email = "", licenceKey = "", proxyHost = "", proxyUserName = "", proxyUserPassword = "")
-    activation_result = TransmitterWrapper.Activate(email, licenceKey, proxyHost, proxyUserName, proxyUserPassword)
+  private_class_method def self.activate(licenceKey = "", proxyHost = "", proxyUserName = "", proxyUserPassword = "")
+    activation_result = TransmitterWrapper.Activate(licenceKey, proxyHost, proxyUserName, proxyUserPassword)
     if activation_result < 0
       error_message = get_native_error
       raise Exception.new "Javonet activation result: " + activation_result.to_s + ". " + error_message

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

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

package/Binaries/Ruby/MacOs/X64/core/exceptions/exception_serializer.rb

@@ -1,6 +1,5 @@
 require_relative '../exceptions/exception_type'
 
-
 class ExceptionSerializer
 
   def self.serialize_exception(exception, command)
@@ -15,7 +14,7 @@ class ExceptionSerializer
     stack_files = ""
     stack_trace.each_with_index do |value, index|
       stack_file, stack_class, stack_line, stack_method = parse_stack_frame(value)
-      if !stack_file.include?("javonet-ruby-sdk")
+      unless stack_file.include?("javonet-ruby-sdk") or stack_file.include?("Binaries/Ruby")
         append_to_string(stack_classes, stack_class)
         append_to_string(stack_methods, stack_method)
         append_to_string(stack_lines, stack_line)
@@ -41,7 +40,7 @@ class ExceptionSerializer
     return exception_command
   end
 
-  def self.append_to_string(string,value)
+  def self.append_to_string(string, value)
     if value.nil?
       string << "undefined"
     else

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

@@ -30,16 +30,16 @@ class Transmitter
     return activate()
   end
 
-  def self.activate_with_credentials(email, licenceKey)
-    return activate(email, licenceKey)
+  def self.activate_with_credentials(licenceKey)
+    return activate(licenceKey)
   end
 
-  def self.activate_with_credentials_and_proxy(email, licenceKey, proxyHost, proxyUserName, proxyPassword)
-    return activate(email, licenceKey, proxyHost, proxyUserName, proxyPassword)
+  def self.activate_with_credentials_and_proxy(licenceKey, proxyHost, proxyUserName, proxyPassword)
+    return activate(licenceKey, proxyHost, proxyUserName, proxyPassword)
   end
 
-  private_class_method def self.activate(email = "", licenceKey = "", proxyHost = "", proxyUserName = "", proxyUserPassword = "")
-    activation_result = TransmitterWrapper.Activate(email, licenceKey, proxyHost, proxyUserName, proxyUserPassword)
+  private_class_method def self.activate(licenceKey = "", proxyHost = "", proxyUserName = "", proxyUserPassword = "")
+    activation_result = TransmitterWrapper.Activate(licenceKey, proxyHost, proxyUserName, proxyUserPassword)
     if activation_result < 0
       error_message = get_native_error
       raise Exception.new "Javonet activation result: " + activation_result.to_s + ". " + error_message

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

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

package/Binaries/Ruby/Windows/X64/core/exceptions/exception_serializer.rb

@@ -1,6 +1,5 @@
 require_relative '../exceptions/exception_type'
 
-
 class ExceptionSerializer
 
   def self.serialize_exception(exception, command)
@@ -15,7 +14,7 @@ class ExceptionSerializer
     stack_files = ""
     stack_trace.each_with_index do |value, index|
       stack_file, stack_class, stack_line, stack_method = parse_stack_frame(value)
-      if !stack_file.include?("javonet-ruby-sdk")
+      unless stack_file.include?("javonet-ruby-sdk") or stack_file.include?("Binaries/Ruby")
         append_to_string(stack_classes, stack_class)
         append_to_string(stack_methods, stack_method)
         append_to_string(stack_lines, stack_line)
@@ -41,7 +40,7 @@ class ExceptionSerializer
     return exception_command
   end
 
-  def self.append_to_string(string,value)
+  def self.append_to_string(string, value)
     if value.nil?
       string << "undefined"
     else

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

@@ -30,16 +30,16 @@ class Transmitter
     return activate()
   end
 
-  def self.activate_with_credentials(email, licenceKey)
-    return activate(email, licenceKey)
+  def self.activate_with_credentials(licenceKey)
+    return activate(licenceKey)
   end
 
-  def self.activate_with_credentials_and_proxy(email, licenceKey, proxyHost, proxyUserName, proxyPassword)
-    return activate(email, licenceKey, proxyHost, proxyUserName, proxyPassword)
+  def self.activate_with_credentials_and_proxy(licenceKey, proxyHost, proxyUserName, proxyPassword)
+    return activate(licenceKey, proxyHost, proxyUserName, proxyPassword)
   end
 
-  private_class_method def self.activate(email = "", licenceKey = "", proxyHost = "", proxyUserName = "", proxyUserPassword = "")
-    activation_result = TransmitterWrapper.Activate(email, licenceKey, proxyHost, proxyUserName, proxyUserPassword)
+  private_class_method def self.activate(licenceKey = "", proxyHost = "", proxyUserName = "", proxyUserPassword = "")
+    activation_result = TransmitterWrapper.Activate(licenceKey, proxyHost, proxyUserName, proxyUserPassword)
     if activation_result < 0
       error_message = get_native_error
       raise Exception.new "Javonet activation result: " + activation_result.to_s + ". " + error_message

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

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

package/addon/JavonetNodejsRuntimeAddon.cpp

@@ -168,12 +168,11 @@ void Activate(const FunctionCallbackInfo<Value>& args)
 {
 	isolate = args.GetIsolate();
 	if (
-		args.Length() != 5 ||
+		args.Length() != 4 ||
 		!args[0]->IsString() ||
 		!args[1]->IsString() ||
 		!args[2]->IsString() ||
-		!args[3]->IsString() ||
-		!args[4]->IsString()
+		!args[3]->IsString()
 		) {
 		isolate->ThrowException(Exception::TypeError(
 			String::NewFromUtf8(isolate, "Wrong number of arguments or wrong argument types.",
@@ -181,20 +180,18 @@ void Activate(const FunctionCallbackInfo<Value>& args)
 		return;
 	}
 
-	v8::String::Utf8Value emailstr(isolate, args[0]);
-	v8::String::Utf8Value licencekeystr(isolate, args[1]);
-	v8::String::Utf8Value proxyhoststr(isolate, args[2]);
-	v8::String::Utf8Value proxyusernamestr(isolate, args[3]);
-	v8::String::Utf8Value proxypasswordstr(isolate, args[4]);
+	v8::String::Utf8Value licencekeystr(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 email(*emailstr);
 	std::string licenceKey(*licencekeystr);
 	std::string proxyHost(*proxyhoststr);
 	std::string proxyUserName(*proxyusernamestr);
 	std::string proxyPassword(*proxypasswordstr);
 
-	auto activationResult = ActivateNative_Fn(email.c_str(), licenceKey.c_str(), proxyHost.c_str(), proxyUserName.c_str(), proxyPassword.c_str());
+	auto activationResult = ActivateNative_Fn(licenceKey.c_str(), proxyHost.c_str(), proxyUserName.c_str(), proxyPassword.c_str());
 	args.GetReturnValue().Set(activationResult);
 	if (activationResult < 0) {
 		const char* errorMessage = GetNativeError_Fn();

package/addon/JavonetNodejsRuntimeAddon.h

@@ -52,7 +52,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*, const char*);
+typedef int(*ActivateNative)(const char*, const char*, const char*, const char*);
 typedef const char*(*GetNativeError)();
 
 SendCommandNative SendCommandNative_Fn{ nullptr };

package/lib/Javonet.js

@@ -15,12 +15,12 @@ class Javonet {
         return new RuntimeFactory(ConnectionType.TCP, address)
     }
 
-    static activate(email, licenceKey) {
-        return Transmitter.activateWithCredentials(email, licenceKey);
+    static activate(licenceKey) {
+        return Transmitter.activateWithCredentials(licenceKey);
     }
 
-    static activate(email, licenceKey, proxyHost, proxyUserName="", proxyUserPassword="", proxyDomain="") {
-        return Transmitter.activateWithCredentialsAndProxy(email, licenceKey, proxyHost, proxyUserName, proxyUserPassword, proxyDomain);
+    static activate(licenceKey, proxyHost, proxyUserName="", proxyUserPassword="", proxyDomain="") {
+        return Transmitter.activateWithCredentialsAndProxy(licenceKey, proxyHost, proxyUserName, proxyUserPassword, proxyDomain);
     }
 }
 

package/lib/core/transmitter/Transmitter.js

@@ -6,20 +6,20 @@ class Transmitter {
         return wrapper.sendCommand(messageArray)
     }
 
-    static #activate = function(email = "", licenceKey = "", proxyHost = "", proxyUserName="", proxyUserPassword="") {
-        return wrapper.activate(email, licenceKey, proxyHost, proxyUserName, proxyUserPassword)
+    static #activate = function(licenceKey = "", proxyHost = "", proxyUserName="", proxyUserPassword="") {
+        return wrapper.activate(licenceKey, proxyHost, proxyUserName, proxyUserPassword)
     }
 
     static activateWithLicenceFile() {
         return this.#activate()
     }
 
-    static activateWithCredentials(email, licenceKey) {
-        return this.#activate(email, licenceKey)
+    static activateWithCredentials(licenceKey) {
+        return this.#activate(licenceKey)
     }
 
-    static activateWithCredentialsAndProxy(email, licenceKey, proxyHost, proxyUserName, proxyUserPassword) {
-        return this.#activate(email, licenceKey, proxyHost, proxyUserName, proxyUserPassword)
+    static activateWithCredentialsAndProxy(licenceKey, proxyHost, proxyUserName, proxyUserPassword) {
+        return this.#activate(licenceKey, proxyHost, proxyUserName, proxyUserPassword)
     }
 }
 

package/lib/core/transmitter/TransmitterWrapper.js

@@ -12,9 +12,9 @@ class TransmitterWrapper {
         return library.initializeTransmitter(binariesRootPath)
     }
 
-    static activate(email, licenceKey, proxyHost, proxyUserName, proxyUserPassword) {
+    static activate(licenceKey, proxyHost, proxyUserName, proxyUserPassword) {
         this.initialize()
-        return library.activate(email, licenceKey, proxyHost, proxyUserName, proxyUserPassword)
+        return library.activate(licenceKey, proxyHost, proxyUserName, proxyUserPassword)
     }
 
     static sendCommand(messageArray) {

package/lib/sdk/internal/InvocationContext.js

@@ -13,6 +13,10 @@ class InvocationContext {
     #isExecuted
     #resultValue
 
+    get_current_command() {
+        return this.#currentCommand
+    }
+
     constructor(runtime, connectionType, tcpAddress, command, isExecuted = false) {
         this.#runtime = runtime
         this.#connectionType = connectionType
@@ -31,7 +35,7 @@ class InvocationContext {
         }
     }
 
-    [Symbol.iterator] = function() {
+    [Symbol.iterator] = function () {
         if (this.#currentCommand.commandType != CommandType.Reference) {
             throw new Error("Object is not iterable")
         }
@@ -39,7 +43,7 @@ class InvocationContext {
         let arraySize = this.getSize().execute().getValue()
 
         return {
-            next: () => ({value: this.getIndex(++position), done: (position >= arraySize)})
+            next: () => ({ value: this.getIndex(++position), done: (position >= arraySize) })
         }
     }
 
@@ -146,8 +150,13 @@ class InvocationContext {
     }
 
     #encapsulatePayloadItem = function (payloadItem) {
-        if (typeof (payloadItem) === 'InvocationContext' || payloadItem instanceof InvocationContext) {
-            return new Command(this.runtimeName, CommandType.Value, [payloadItem.#currentCommand])
+        if (typeof (payloadItem) === 'Command' || payloadItem instanceof Command) {
+            for (let i = 0; i < payloadItem.payload.length; i++) {
+                payloadItem.payload[i] = this.#encapsulatePayloadItem(payloadItem.payload[i])
+            }
+            return payloadItem
+        } else if (typeof (payloadItem) === 'InvocationContext' || payloadItem instanceof InvocationContext) {
+            return payloadItem.get_current_command()
         } else if (payloadItem instanceof Array) {
             for (let i = 0; i < payloadItem.length; i++) {
                 payloadItem[i] = this.#encapsulatePayloadItem(payloadItem[i])

package/lib/sdk/internal/RuntimeContext.js

@@ -72,8 +72,8 @@ 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])
+    cast(...args) {
+        let localCommand = new Command(this.runtimeName, CommandType.Cast, args)
         this.#currentCommand = null
         return new InvocationContext(this.runtimeName, this.connectionType, this.tcpConnectionData, this.#buildCommand(localCommand))
     }
@@ -100,13 +100,19 @@ class RuntimeContext {
     }
 
     #encapsulatePayloadItem = function (payloadItem) {
-        if (payloadItem instanceof Array) {
+        if (typeof (payloadItem) === 'Command' || payloadItem instanceof Command) {
+            for (let i = 0; i < payloadItem.payload.length; i++) {
+                payloadItem.payload[i] = this.#encapsulatePayloadItem(payloadItem.payload[i])
+            }
+            return payloadItem
+        } else if (typeof (payloadItem) === 'InvocationContext' || payloadItem instanceof InvocationContext) {
+            return payloadItem.get_current_command()
+        } else if (payloadItem instanceof Array) {
             for (let i = 0; i < payloadItem.length; i++) {
                 payloadItem[i] = this.#encapsulatePayloadItem(payloadItem[i])
             }
             return new Command(this.runtimeName, CommandType.Array, payloadItem)
-        }
-        else {
+        } else {
             return new Command(this.runtimeName, CommandType.Value, [payloadItem])
         }
     }

package/package.json

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