javonet-nodejs-sdk 2.4.11 → 2.5.1

package/Binaries/Python/javonet/core/receiver/Receiver.py

@@ -1,18 +1,18 @@
 from javonet.core.interpreter.Interpreter import Interpreter
+from javonet.core.protocol.CommandSerializer import CommandSerializer
 from javonet.utils.connectionData.InMemoryConnectionData import InMemoryConnectionData
 
 
 class Receiver:
 
     def __init__(self):
-        self.python_interpreter = Interpreter()
         self.connection_data = InMemoryConnectionData()
 
-    def SendCommand(self, messageByteArray, messageByteArrayLen):
-        return bytearray(self.python_interpreter.process(messageByteArray, len(messageByteArray), self.connection_data))
+    def SendCommand(self, message_byte_array, messageByteArrayLen):
+        return bytearray(CommandSerializer().serialize(Interpreter().process(message_byte_array), self.connection_data))
 
-    def HeartBeat(self, messageByteArray, messageByteArrayLen):
+    def HeartBeat(self, message_byte_array, messageByteArrayLen):
         response_byte_array = bytearray(2)
-        response_byte_array[0] = messageByteArray[11]
-        response_byte_array[1] = messageByteArray[12] - 2
+        response_byte_array[0] = message_byte_array[11]
+        response_byte_array[1] = message_byte_array[12] - 2
         return response_byte_array

package/Binaries/Python/javonet/core/transmitter/TransmitterWrapper.py

@@ -9,15 +9,21 @@ callbackFunction = CMPFUNC(callbackFunc)
 
 
 class TransmitterWrapper:
+    file_path = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
+    machine = platform.machine().lower()
+    if '64' in machine:
+        arch = 'X64'
+    elif 'arm' in machine:
+        arch = 'ARM64' if '64' in machine else 'ARM'
+    else:
+        arch = 'X86'
+
     if platform.system() == 'Windows':
-        file_path = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
-        python_lib_path = file_path + '\\Binaries\\Native\\Windows\\X64\\JavonetPythonRuntimeNative.dll'
-    if platform.system() == 'Linux':
-        file_path = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
-        python_lib_path = file_path + '/Binaries/Native/Linux/X64/libJavonetPythonRuntimeNative.so'
-    if platform.system() == 'Darwin':
-        file_path = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
-        python_lib_path = file_path + '/Binaries/Native/MacOs/X64/libJavonetPythonRuntimeNative.dylib'
+        python_lib_path = file_path + f'/Binaries/Native/Windows/{arch}/JavonetPythonRuntimeNative.dll'
+    elif platform.system() == 'Linux':
+        python_lib_path = file_path + f'/Binaries/Native/Linux/{arch}/libJavonetPythonRuntimeNative.so'
+    elif platform.system() == 'Darwin':
+        python_lib_path = file_path + f'/Binaries/Native/MacOs/{arch}/libJavonetPythonRuntimeNative.dylib'
 
     python_lib = cdll.LoadLibrary(python_lib_path)
     python_lib.SetCallback(callbackFunction)

package/Binaries/Python/javonet/core/webSocketClient/WebSocketClient.py

@@ -1,4 +1,3 @@
-import asyncio
 import struct
 from websockets.sync.client import connect
 

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

@@ -1,16 +1,31 @@
 module TransmitterWrapper
   extend FFI::Library
+
+  arch = case FFI::Platform::ARCH
+         when 'x86_64'
+           'X64'
+         when 'x86'
+           'X86'
+         when 'arm'
+           'ARM'
+         when 'aarch64'
+           'ARM64'
+         else
+           raise "Unsupported architecture: #{FFI::Platform::ARCH}"
+         end
+
   if OS.linux?
-    ffi_lib File.expand_path('../../../Binaries/Native/Linux/X64/libJavonetRubyRuntimeNative.so', __FILE__)
+    ffi_lib File.expand_path("../../../Binaries/Native/Linux/#{arch}/libJavonetRubyRuntimeNative.so", __FILE__)
   elsif OS.mac?
-    ffi_lib File.expand_path('../../../Binaries/Native/MacOs/X64/libJavonetRubyRuntimeNative.dylib', __FILE__)
+    ffi_lib File.expand_path("../../../Binaries/Native/MacOs/#{arch}/libJavonetRubyRuntimeNative.dylib", __FILE__)
   else
-    RubyInstaller::Runtime.add_dll_directory(File.expand_path('../../../Binaries/Native/Windows/X64/', __FILE__))
-    ffi_lib File.expand_path('../../../Binaries/Native/Windows/X64/JavonetRubyRuntimeNative.dll', __FILE__)
+    RubyInstaller::Runtime.add_dll_directory(File.expand_path("../../../Binaries/Native/Windows/#{arch}/", __FILE__))
+    ffi_lib File.expand_path("../../../Binaries/Native/Windows/#{arch}/JavonetRubyRuntimeNative.dll", __FILE__)
   end
+
   attach_function :SendCommand, [:pointer, :int], :int
   attach_function :ReadResponse, [:pointer, :int], :int
   attach_function :Activate, [:pointer, :pointer, :pointer, :pointer], :int
   attach_function :GetNativeError, [], :string
   attach_function :SetConfigSource, [:pointer], :int
-end
+end

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

@@ -1,16 +1,31 @@
 module TransmitterWrapper
   extend FFI::Library
+
+  arch = case FFI::Platform::ARCH
+         when 'x86_64'
+           'X64'
+         when 'x86'
+           'X86'
+         when 'arm'
+           'ARM'
+         when 'aarch64'
+           'ARM64'
+         else
+           raise "Unsupported architecture: #{FFI::Platform::ARCH}"
+         end
+
   if OS.linux?
-    ffi_lib File.expand_path('../../../Binaries/Native/Linux/X64/libJavonetRubyRuntimeNative.so', __FILE__)
+    ffi_lib File.expand_path("../../../Binaries/Native/Linux/#{arch}/libJavonetRubyRuntimeNative.so", __FILE__)
   elsif OS.mac?
-    ffi_lib File.expand_path('../../../Binaries/Native/MacOs/X64/libJavonetRubyRuntimeNative.dylib', __FILE__)
+    ffi_lib File.expand_path("../../../Binaries/Native/MacOs/#{arch}/libJavonetRubyRuntimeNative.dylib", __FILE__)
   else
-    RubyInstaller::Runtime.add_dll_directory(File.expand_path('../../../Binaries/Native/Windows/X64/', __FILE__))
-    ffi_lib File.expand_path('../../../Binaries/Native/Windows/X64/JavonetRubyRuntimeNative.dll', __FILE__)
+    RubyInstaller::Runtime.add_dll_directory(File.expand_path("../../../Binaries/Native/Windows/#{arch}/", __FILE__))
+    ffi_lib File.expand_path("../../../Binaries/Native/Windows/#{arch}/JavonetRubyRuntimeNative.dll", __FILE__)
   end
+
   attach_function :SendCommand, [:pointer, :int], :int
   attach_function :ReadResponse, [:pointer, :int], :int
   attach_function :Activate, [:pointer, :pointer, :pointer, :pointer], :int
   attach_function :GetNativeError, [], :string
   attach_function :SetConfigSource, [:pointer], :int
-end
+end

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

@@ -1,16 +1,31 @@
 module TransmitterWrapper
   extend FFI::Library
+
+  arch = case FFI::Platform::ARCH
+         when 'x86_64'
+           'X64'
+         when 'x86'
+           'X86'
+         when 'arm'
+           'ARM'
+         when 'aarch64'
+           'ARM64'
+         else
+           raise "Unsupported architecture: #{FFI::Platform::ARCH}"
+         end
+
   if OS.linux?
-    ffi_lib File.expand_path('../../../Binaries/Native/Linux/X64/libJavonetRubyRuntimeNative.so', __FILE__)
+    ffi_lib File.expand_path("../../../Binaries/Native/Linux/#{arch}/libJavonetRubyRuntimeNative.so", __FILE__)
   elsif OS.mac?
-    ffi_lib File.expand_path('../../../Binaries/Native/MacOs/X64/libJavonetRubyRuntimeNative.dylib', __FILE__)
+    ffi_lib File.expand_path("../../../Binaries/Native/MacOs/#{arch}/libJavonetRubyRuntimeNative.dylib", __FILE__)
   else
-    RubyInstaller::Runtime.add_dll_directory(File.expand_path('../../../Binaries/Native/Windows/X64/', __FILE__))
-    ffi_lib File.expand_path('../../../Binaries/Native/Windows/X64/JavonetRubyRuntimeNative.dll', __FILE__)
+    RubyInstaller::Runtime.add_dll_directory(File.expand_path("../../../Binaries/Native/Windows/#{arch}/", __FILE__))
+    ffi_lib File.expand_path("../../../Binaries/Native/Windows/#{arch}/JavonetRubyRuntimeNative.dll", __FILE__)
   end
+
   attach_function :SendCommand, [:pointer, :int], :int
   attach_function :ReadResponse, [:pointer, :int], :int
   attach_function :Activate, [:pointer, :pointer, :pointer, :pointer], :int
   attach_function :GetNativeError, [], :string
   attach_function :SetConfigSource, [:pointer], :int
-end
+end

package/Binaries/version.txt

@@ -1 +1 @@
-2.4.11
+2.5.1

package/addon/JavonetNodejsRuntimeAddon.cpp

@@ -10,10 +10,18 @@ void InitializeTransmitter(const FunctionCallbackInfo<Value>& args) {
 	}
 	v8::String::Utf8Value str(isolate, args[0]);
 	std::string nodeJsAddonPath(*str);
-
+    std::string arch = "";
 #ifdef _WIN32
-	nativeLibFullPath = nodeJsAddonPath + "\\Binaries\\Native\\Windows\\X64\\JavonetNodejsRuntimeNative.dll";
-
+#if defined(_WIN64) && defined(_M_ARM64)
+arch = "ARM64";
+#elif defined(_WIN64)
+arch = "X64";
+#elif defined(_M_ARM)
+arch = "ARM";
+#else
+arch = "X86";
+#endif
+    nativeLibFullPath = nodeJsAddonPath + "\\Binaries\\Native\\Windows\\" + arch + "\\JavonetNodejsRuntimeNative.dll";
 	JavonetNodejsRuntimeNativeLibInstance = LoadLibraryA(nativeLibFullPath.c_str());
 	if (!JavonetNodejsRuntimeNativeLibInstance) {
 		char errorMessage[300];
@@ -26,12 +34,24 @@ void InitializeTransmitter(const FunctionCallbackInfo<Value>& args) {
 #endif //_WIN32
 
 #if defined(__linux__) || defined(__APPLE__)
+#if __aarch64__
+arch = "ARM64";
+#elif __x86_64__ || __ppc64__
+arch = "X64";
+#elif __arm__
+arch = "ARM";
+#else
+arch = "X86";
+#endif
 #if defined(__linux__)
-	nativeLibFullPath = nodeJsAddonPath + "/Binaries/Native/Linux/X64/libJavonetNodejsRuntimeNative.so";
+	std::string sharedLibName = "libJavonetNodejsRuntimeNative.so";
+	nativeLibFullPath = nodeJsAddonPath + "/Binaries/Native/Linux/" + arch + "/" + sharedLibName;
 #endif	//__linux__
 #if defined(__APPLE__)
-	nativeLibFullPath = nodeJsAddonPath + "/Binaries/Native/MacOs/X64/libJavonetNodejsRuntimeNative.dylib";
+    std::string sharedLibName = "libJavonetNodejsRuntimeNative.dylib";
+    nativeLibFullPath = nodeJsAddonPath + "/Binaries/Native/MacOs/" + arch + "/" + sharedLibName;
 #endif	 //__APPLE__
+
 	JavonetNodejsRuntimeNativeLibInstance = dlopen(nativeLibFullPath.c_str(), RTLD_LAZY);
 	char* error = dlerror();
 	if (JavonetNodejsRuntimeNativeLibInstance == NULL || error != NULL) {
@@ -80,7 +100,7 @@ void SendCommand(const FunctionCallbackInfo<Value>& args)
 		messageByteArray[i] = messageArray->Get(context, i).ToLocalChecked()->Uint32Value(context).FromMaybe(0);
 	}
 	responseArrayLen = SendCommandNative_Fn((byte*)messageByteArray, messageArrayLen);
-	
+
 	if (responseArrayLen > 0) {
 		responseByteArray = new byte[responseArrayLen];
 		ReadResponseNative_Fn(responseByteArray, responseArrayLen);
@@ -155,7 +175,7 @@ void Activate(const FunctionCallbackInfo<Value>& args)
 		isolate->ThrowException(Exception::Error(
 			String::NewFromUtf8(isolate, errorMessage2.c_str(),
 				NewStringType::kNormal).ToLocalChecked()));
-	} 
+	}
 	return;
 }
 

package/lib/sdk/ConfigRuntimeFactory.js

@@ -94,19 +94,36 @@ class ConfigRuntimeFactory {
         } catch (error) {
             // licenseKey not found - do nothing
         }
-    
+        let rtmCtx = null;
         let connType = jfr.getChannelType(RuntimeNameHandler.getName(runtime), configName);
         if (connType === "tcp") {
             let connData = new TcpConnectionData(jfr.getChannelHost(RuntimeNameHandler.getName(runtime), configName),
                                                  jfr.getChannelPort(RuntimeNameHandler.getName(runtime), configName));
-            return RuntimeContext.getInstance(runtime, ConnectionType.TCP, connData);
+            rtmCtx = RuntimeContext.getInstance(runtime, ConnectionType.TCP, connData);
         } else if (connType === "inMemory") {
-            return RuntimeContext.getInstance(runtime, ConnectionType.IN_MEMORY, null);
+            rtmCtx = RuntimeContext.getInstance(runtime, ConnectionType.IN_MEMORY, null);
         } else {
             throw new Error("Invalid connection type");
         }
+        this.#loadModules(runtime, configName, jfr, rtmCtx);
+        return rtmCtx;
     }
 
+    #loadModules(runtime, configName, jfr, rtmCtx) {
+        const modules = jfr.getModules(RuntimeNameHandler.getName(runtime), configName)
+            .split(';')
+            .filter(module => module.trim() !== '');
+
+        const configDirectoryAbsolutePath = require('path').dirname(this.path);
+
+        modules.forEach(module => {
+            if (require('path').isAbsolute(module)) {
+                rtmCtx.loadLibrary(module);
+            } else {
+                rtmCtx.loadLibrary(require('path').join(configDirectoryAbsolutePath, module));
+            }
+        });
+    }
 
 }
 

package/lib/sdk/Javonet.js

@@ -72,34 +72,6 @@ class Javonet {
         }
 
     }
-
-    /**
-     * Activates Javonet with the provided license key and proxy host.
-     * @param {string} licenseKey - The license key to activate Javonet.
-     * @param {string} proxyHost - The host for the proxy server.
-     * @param {string} [proxyUserName=""] - The username for the proxy server (optional).
-     * @param {string} [proxyUserPassword=""] - The password for the proxy server (optional).
-     * @returns {number} The activation status code.
-     * @see [Javonet Guides](https://www.javonet.com/guides/v2/javascript/getting-started/activating-javonet)
-     */
-    static activate(
-        licenseKey,
-        proxyHost = "",
-        proxyUserName = "",
-        proxyUserPassword = "",
-    ) {
-        try {
-            return Transmitter.activateWithCredentialsAndProxy(
-                licenseKey,
-                proxyHost,
-                proxyUserName,
-                proxyUserPassword
-            );
-        } catch (error) {
-            SDKExceptionHelper.sendExceptionToAppInsights(error, licenseKey);
-            throw error;
-        }
-    }
 }
 
 module.exports = {

package/lib/sdk/tools/JsonFileResolver.js

@@ -70,6 +70,14 @@ class JsonFileResolver {
         }
         return channel.port;
     }
+
+    getModules(runtimeName, configName) {
+        const runtime = this.getRuntime(runtimeName, configName);
+        if (runtime.hasOwnProperty('modules')) {
+            return runtime.modules;
+        }
+        return "";
+    }
 }
 
 module.exports = JsonFileResolver;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "javonet-nodejs-sdk",
-  "version": "2.4.11",
+  "version": "2.5.1",
   "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": [],