javonet-ruby-sdk 2.1.0 → 2.1.1

data/lib/javonet-ruby-sdk/core/transmitter/transmitter.rb

@@ -4,17 +4,25 @@ require_relative 'transmitter_wrapper'
 
 class Transmitter
 
-  def self.send_command(messageArray, messageArrayLen)
-    message = FFI::MemoryPointer.new(:uchar, messageArrayLen, true)
-    message.put_array_of_uchar(0, messageArray)
-    responseArrayLen = TransmitterWrapper.SendCommand(message, messageArrayLen)
-    if responseArrayLen >0
-      response = FFI::MemoryPointer.new(:uchar, responseArrayLen, true)
-      TransmitterWrapper.ReadResponse(response, responseArrayLen)
-      responseArray = response.get_array_of_uchar(0, responseArrayLen)
-      return responseArray
+  def self.get_native_error
+    TransmitterWrapper.GetNativeError
+  end
+
+  def self.send_command(message_byte_array, message_byte_array_len)
+    message = FFI::MemoryPointer.new(:uchar, message_byte_array_len, true)
+    message.put_array_of_uchar(0, message_byte_array)
+    response_byte_array_len = TransmitterWrapper.SendCommand(message, message_byte_array_len)
+    if response_byte_array_len > 0
+      response = FFI::MemoryPointer.new(:uchar, response_byte_array_len, true)
+      TransmitterWrapper.ReadResponse(response, response_byte_array_len)
+      response_byte_array = response.get_array_of_uchar(0, response_byte_array_len)
+      return response_byte_array
+    elsif response_byte_array_len == 0
+      error_message = "Response is empty"
+      raise Exception.new error_message
     else
-      raise Exception.new "Javonet native error code: " + responseArrayLen.to_s
+      error_message = get_native_error
+      raise Exception.new "Javonet native error code: " + response_byte_array_len.to_s + ". " + error_message
     end
   end
 
@@ -30,8 +38,14 @@ class Transmitter
     return activate(email, licenceKey, proxyHost, proxyUserName, proxyPassword)
   end
 
-  private_class_method def self.activate(email="", licenceKey="", proxyHost="", proxyUserName="", proxyUserPassword="")
-    return TransmitterWrapper.Activate(email, licenceKey, proxyHost, proxyUserName, proxyUserPassword)
+  private_class_method def self.activate(email = "", licenceKey = "", proxyHost = "", proxyUserName = "", proxyUserPassword = "")
+    activation_result = TransmitterWrapper.Activate(email, 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
+    else
+      return activation_result
+    end
   end
 
 end

data/lib/javonet-ruby-sdk/core/transmitter/transmitter_wrapper.rb

@@ -1,15 +1,16 @@
 module TransmitterWrapper
   extend FFI::Library
-    if OS.linux?
-      ffi_lib File.expand_path('../../../Binaries/Native/Linux/X64/libJavonetRubyRuntimeNative.so', __FILE__)
-    elsif OS.mac?
-      ffi_lib File.expand_path('../../../Binaries/Native/MacOs/X64/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__ )
-    end
-    attach_function :SendCommand, [:pointer, :int], :int
-    attach_function :ReadResponse, [:pointer, :int], :int
-    attach_function :Activate, [:pointer, :pointer, :pointer, :pointer, :pointer], :int
+  if OS.linux?
+    ffi_lib File.expand_path('../../../Binaries/Native/Linux/X64/libJavonetRubyRuntimeNative.so', __FILE__)
+  elsif OS.mac?
+    ffi_lib File.expand_path('../../../Binaries/Native/MacOs/X64/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__)
+  end
+  attach_function :SendCommand, [:pointer, :int], :int
+  attach_function :ReadResponse, [:pointer, :int], :int
+  attach_function :Activate, [:pointer, :pointer, :pointer, :pointer, :pointer], :int
+  attach_function :GetNativeError, [], :string
 
 end

data/lib/javonet-ruby-sdk/sdk/internal/invocation_context.rb

@@ -1,8 +1,11 @@
 require_relative 'abstract/abstract_invocation_context'
 require_relative '../../core/interpreter/interpreter'
 require_relative '../../core/exceptions/exception_thrower'
+require_relative 'invocation_context_iterator'
 
 class InvocationContext < AbstractInvocationContext
+  include Enumerable
+
   def initialize(runtime_name, connection_type, tcp_ip_address, command, is_executed = false)
     @is_executed = is_executed
     @runtime_name = runtime_name
@@ -11,7 +14,6 @@ class InvocationContext < AbstractInvocationContext
     @current_command = command
     @response_command = nil
     @interpreter = Interpreter.new
-    @handler = nil
     ObjectSpace.define_finalizer(self, self.finalize(@current_command, @is_executed, @interpreter, @connection_type, @tcp_ip_address))
   end
 
@@ -19,16 +21,37 @@ class InvocationContext < AbstractInvocationContext
     proc do
       if command.command_type == CommandType::REFERENCE && is_executed == true
         destructCommand = Command.new(@runtime_name, CommandType::DESTRUCT_REFERENCE, command.payload)
-        if @runtime_name == RuntimeName::RUBY
-          handler = Handler.new
-          handler.handle_command(destructCommand)
-        else
-          interpreter.execute(destructCommand, connection_type, tcp_ip_address)
-        end
+        interpreter.execute(destructCommand, connection_type, tcp_ip_address)
       end
     end
   end
 
+  def iterator
+    if @current_command.command_type != CommandType::REFERENCE
+      raise "Object is not iterable"
+    else
+      return InvocationContextIterator.new(self)
+    end
+  end
+
+  def [](i)
+    if @current_command.command_type != CommandType::REFERENCE
+      raise "Object is not iterable"
+    else
+      invocation_context_iterator = InvocationContextIterator.new(self)
+      return invocation_context_iterator[i]
+    end
+  end
+
+  def []=(i, value)
+    if @current_command.command_type != CommandType::REFERENCE
+      raise "Object is not iterable"
+    else
+      invocation_context_iterator = InvocationContextIterator.new(self)
+      return invocation_context_iterator[i] = value
+    end
+  end
+
   def execute
     @response_command = @interpreter.execute(@current_command, @connection_type, @tcp_ip_address)
 
@@ -101,17 +124,17 @@ class InvocationContext < AbstractInvocationContext
 
   def build_command(command)
     command.payload.each_index { |i|
-      command.payload[i] = iterate(command.payload[i])
+      command.payload[i] = encapsulate_payload_item(command.payload[i])
     }
     return command.add_arg_to_payload_on_beginning(@current_command)
   end
 
-  def iterate(payload_item)
+  def encapsulate_payload_item(payload_item)
     if payload_item.is_a? InvocationContext
       Command.new(@runtime_name, CommandType::VALUE, [*payload_item.current_command])
     elsif payload_item.is_a? Array
       payload_item.each_index { |i|
-        payload_item[i] = iterate(payload_item)
+        payload_item[i] = encapsulate_payload_item(payload_item)
       }
       return Command.new(@runtime_name, CommandType::ARRAY, [*payload_item])
     else

data/lib/javonet-ruby-sdk/sdk/internal/invocation_context_iterator.rb

@@ -0,0 +1,28 @@
+class InvocationContextIterator
+  include Enumerable
+
+  attr_accessor :_array_as_invocation_context
+  private :_array_as_invocation_context
+
+  def initialize(array_as_invocation_context)
+    @_array_as_invocation_context = array_as_invocation_context
+    @position = -1
+    @array_size = @_array_as_invocation_context.get_size().execute().get_value()
+    @array_as_list = [1, 2, 3, 4, 5]
+    @array_as_list.each_index { |i|
+      @array_as_list[i] = _array_as_invocation_context.get_index(i)
+    }
+  end
+
+  def each(&block)
+    return @array_as_list.each(&block)
+  end
+
+  def [](i)
+    return @_array_as_invocation_context.get_index(i)
+  end
+
+  def []=(i, value)
+    return @_array_as_invocation_context.set_index(value, i).execute
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: javonet-ruby-sdk
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - SdNCenter Sp. z o. o.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-07 00:00:00.000000000 Z
+date: 2023-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -315,8 +315,8 @@ files:
 - lib/javonet-ruby-sdk/Binaries/Nodejs/Linux/X64/core/protocol/TypeEncoder.js
 - lib/javonet-ruby-sdk/Binaries/Nodejs/Linux/X64/core/receiver/Receiver.js
 - lib/javonet-ruby-sdk/Binaries/Nodejs/Linux/X64/core/receiver/ReceiverNative.js
-- lib/javonet-ruby-sdk/Binaries/Nodejs/Linux/X64/core/transmitter/NodejsTransmitter.js
-- lib/javonet-ruby-sdk/Binaries/Nodejs/Linux/X64/core/transmitter/NodejsTransmitterWrapper.js
+- lib/javonet-ruby-sdk/Binaries/Nodejs/Linux/X64/core/transmitter/Transmitter.js
+- lib/javonet-ruby-sdk/Binaries/Nodejs/Linux/X64/core/transmitter/TransmitterWrapper.js
 - lib/javonet-ruby-sdk/Binaries/Nodejs/Linux/X64/utils/Command.js
 - lib/javonet-ruby-sdk/Binaries/Nodejs/Linux/X64/utils/CommandType.js
 - lib/javonet-ruby-sdk/Binaries/Nodejs/Linux/X64/utils/ConnectionType.js
@@ -386,8 +386,8 @@ files:
 - lib/javonet-ruby-sdk/Binaries/Nodejs/MacOs/X64/core/protocol/TypeEncoder.js
 - lib/javonet-ruby-sdk/Binaries/Nodejs/MacOs/X64/core/receiver/Receiver.js
 - lib/javonet-ruby-sdk/Binaries/Nodejs/MacOs/X64/core/receiver/ReceiverNative.js
-- lib/javonet-ruby-sdk/Binaries/Nodejs/MacOs/X64/core/transmitter/NodejsTransmitter.js
-- lib/javonet-ruby-sdk/Binaries/Nodejs/MacOs/X64/core/transmitter/NodejsTransmitterWrapper.js
+- lib/javonet-ruby-sdk/Binaries/Nodejs/MacOs/X64/core/transmitter/Transmitter.js
+- lib/javonet-ruby-sdk/Binaries/Nodejs/MacOs/X64/core/transmitter/TransmitterWrapper.js
 - lib/javonet-ruby-sdk/Binaries/Nodejs/MacOs/X64/utils/Command.js
 - lib/javonet-ruby-sdk/Binaries/Nodejs/MacOs/X64/utils/CommandType.js
 - lib/javonet-ruby-sdk/Binaries/Nodejs/MacOs/X64/utils/ConnectionType.js
@@ -457,8 +457,8 @@ files:
 - lib/javonet-ruby-sdk/Binaries/Nodejs/Windows/X64/core/protocol/TypeEncoder.js
 - lib/javonet-ruby-sdk/Binaries/Nodejs/Windows/X64/core/receiver/Receiver.js
 - lib/javonet-ruby-sdk/Binaries/Nodejs/Windows/X64/core/receiver/ReceiverNative.js
-- lib/javonet-ruby-sdk/Binaries/Nodejs/Windows/X64/core/transmitter/NodejsTransmitter.js
-- lib/javonet-ruby-sdk/Binaries/Nodejs/Windows/X64/core/transmitter/NodejsTransmitterWrapper.js
+- lib/javonet-ruby-sdk/Binaries/Nodejs/Windows/X64/core/transmitter/Transmitter.js
+- lib/javonet-ruby-sdk/Binaries/Nodejs/Windows/X64/core/transmitter/TransmitterWrapper.js
 - lib/javonet-ruby-sdk/Binaries/Nodejs/Windows/X64/utils/Command.js
 - lib/javonet-ruby-sdk/Binaries/Nodejs/Windows/X64/utils/CommandType.js
 - lib/javonet-ruby-sdk/Binaries/Nodejs/Windows/X64/utils/ConnectionType.js
@@ -3088,6 +3088,7 @@ files:
 - lib/javonet-ruby-sdk/sdk/internal/abstract/abstract_runtime_context.rb
 - lib/javonet-ruby-sdk/sdk/internal/abstract/abstract_runtime_factory.rb
 - lib/javonet-ruby-sdk/sdk/internal/invocation_context.rb
+- lib/javonet-ruby-sdk/sdk/internal/invocation_context_iterator.rb
 - lib/javonet-ruby-sdk/sdk/internal/runtime_context.rb
 - lib/javonet-ruby-sdk/sdk/internal/runtime_factory.rb
 - lib/javonet-ruby-sdk/utils/command.rb

data/lib/javonet-ruby-sdk/Binaries/Nodejs/Linux/X64/core/transmitter/NodejsTransmitterWrapper.js

@@ -1,36 +0,0 @@
-let library;
-
-class NodejsTransmitterWrapper {
-    static initialize() {
-       if (process.platform === "win32")
-           library = require(`${require('path').resolve(__dirname, '../../../')}/build/Release/JavonetNodejsRuntimeAddon.node`)
-        else if (process.platform === "darwin")
-           library = require(`${require('path').resolve(__dirname, '../../../')}/build/Release/JavonetNodejsRuntimeAddon.node`)
-        else
-           library = require(`${require('path').resolve(__dirname, '../../../')}/build/Release/JavonetNodejsRuntimeAddon.node`)
-       let binariesRootPath = String(`${require('path').resolve(__dirname, '../../../')}`)
-       return library.initializeTransmitter(binariesRootPath)
-    }
-
-    static activate(email, licenceKey, proxyHost, proxyUserName, proxyUserPassword) {
-        this.initialize()
-        return library.activate(email, licenceKey, proxyHost, proxyUserName, proxyUserPassword)
-    }
-
-    static sendCommand(messageArray) {
-        if (library) {
-            let result = library.sendCommand(messageArray)
-            if (Array.isArray(result)) {
-                return result
-            }
-            else {
-                throw new Error("Javonet native code error: " + result)
-            }
-        }
-        else {
-            throw new Error("Javonet not active")
-        }
-    }
-}
-
-module.exports = NodejsTransmitterWrapper

data/lib/javonet-ruby-sdk/Binaries/Nodejs/MacOs/X64/core/transmitter/NodejsTransmitterWrapper.js

@@ -1,36 +0,0 @@
-let library;
-
-class NodejsTransmitterWrapper {
-    static initialize() {
-       if (process.platform === "win32")
-           library = require(`${require('path').resolve(__dirname, '../../../')}/build/Release/JavonetNodejsRuntimeAddon.node`)
-        else if (process.platform === "darwin")
-           library = require(`${require('path').resolve(__dirname, '../../../')}/build/Release/JavonetNodejsRuntimeAddon.node`)
-        else
-           library = require(`${require('path').resolve(__dirname, '../../../')}/build/Release/JavonetNodejsRuntimeAddon.node`)
-       let binariesRootPath = String(`${require('path').resolve(__dirname, '../../../')}`)
-       return library.initializeTransmitter(binariesRootPath)
-    }
-
-    static activate(email, licenceKey, proxyHost, proxyUserName, proxyUserPassword) {
-        this.initialize()
-        return library.activate(email, licenceKey, proxyHost, proxyUserName, proxyUserPassword)
-    }
-
-    static sendCommand(messageArray) {
-        if (library) {
-            let result = library.sendCommand(messageArray)
-            if (Array.isArray(result)) {
-                return result
-            }
-            else {
-                throw new Error("Javonet native code error: " + result)
-            }
-        }
-        else {
-            throw new Error("Javonet not active")
-        }
-    }
-}
-
-module.exports = NodejsTransmitterWrapper

data/lib/javonet-ruby-sdk/Binaries/Nodejs/Windows/X64/core/transmitter/NodejsTransmitterWrapper.js

@@ -1,36 +0,0 @@
-let library;
-
-class NodejsTransmitterWrapper {
-    static initialize() {
-       if (process.platform === "win32")
-           library = require(`${require('path').resolve(__dirname, '../../../')}/build/Release/JavonetNodejsRuntimeAddon.node`)
-        else if (process.platform === "darwin")
-           library = require(`${require('path').resolve(__dirname, '../../../')}/build/Release/JavonetNodejsRuntimeAddon.node`)
-        else
-           library = require(`${require('path').resolve(__dirname, '../../../')}/build/Release/JavonetNodejsRuntimeAddon.node`)
-       let binariesRootPath = String(`${require('path').resolve(__dirname, '../../../')}`)
-       return library.initializeTransmitter(binariesRootPath)
-    }
-
-    static activate(email, licenceKey, proxyHost, proxyUserName, proxyUserPassword) {
-        this.initialize()
-        return library.activate(email, licenceKey, proxyHost, proxyUserName, proxyUserPassword)
-    }
-
-    static sendCommand(messageArray) {
-        if (library) {
-            let result = library.sendCommand(messageArray)
-            if (Array.isArray(result)) {
-                return result
-            }
-            else {
-                throw new Error("Javonet native code error: " + result)
-            }
-        }
-        else {
-            throw new Error("Javonet not active")
-        }
-    }
-}
-
-module.exports = NodejsTransmitterWrapper