javonet-nodejs-sdk 2.4.11 → 2.5.0

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

@@ -1,16 +1,20 @@
 module TransmitterWrapper
   extend FFI::Library
+
+  arch = FFI::Platform::ARCH == 'x86_64' ? 'X64' : 'X86'
+
   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,20 @@
 module TransmitterWrapper
   extend FFI::Library
+
+  arch = FFI::Platform::ARCH == 'x86_64' ? 'X64' : 'X86'
+
   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.0

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.0",
   "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": [],