javonet-nodejs-sdk 2.5.0 → 2.5.1

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,7 +1,18 @@
 module TransmitterWrapper
   extend FFI::Library
 
-  arch = FFI::Platform::ARCH == 'x86_64' ? 'X64' : 'X86'
+  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/#{arch}/libJavonetRubyRuntimeNative.so", __FILE__)

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

@@ -1,7 +1,18 @@
 module TransmitterWrapper
   extend FFI::Library
 
-  arch = FFI::Platform::ARCH == 'x86_64' ? 'X64' : 'X86'
+  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/#{arch}/libJavonetRubyRuntimeNative.so", __FILE__)

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

@@ -1,7 +1,18 @@
 module TransmitterWrapper
   extend FFI::Library
 
-  arch = FFI::Platform::ARCH == 'x86_64' ? 'X64' : 'X86'
+  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/#{arch}/libJavonetRubyRuntimeNative.so", __FILE__)

package/Binaries/version.txt

@@ -1 +1 @@
-2.5.0
+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/package.json

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