javonet-ruby-sdk 2.5.1 → 2.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f10d0288c84dc4df8428dee8f95d7af6811628d76933139cec2657b5261710ec
-  data.tar.gz: fe3cad81c19333ee2a0efd9a594b8a5e92acae6efcf585ec397aeb307bacd2f6
+  metadata.gz: 2c6b8f1d33fa11a70b33d0065d9b3c08182c7409f8da9af6fc911590dcca74c8
+  data.tar.gz: e743e8377d61db1ee4c8e9d2af441e96f4cf01b929c4bda4e8191196eb04891d
 SHA512:
-  metadata.gz: c1aa0db8e48782693f02cafb63061fb18002d5da1335b96b694064e2337bf42e48ba45850c0fc7ef6a9e19d98f9e52c43fedd26976510216904f29f17dd905fe
-  data.tar.gz: 6cdf6fa48832c57cefc951805e9ebfac384d1471c1882537511477024d995e3ff0c001fdb6fb296b71343e5547c88b21b81e6adb560f56461af6288a525f31e1
+  metadata.gz: 1244bd9ce35599edbe288abb8d4c8de3e48454fd988fbb597112c0368ed305757cac6d7b93af7b0f0a378d6b2a5ed4608f89e6d8af06e47c06ae2a5955435a69
+  data.tar.gz: 9469938c2b75dd528e2e6dd238378fe25e729eff591a2d0ddd5ba79a0d019b9c2ae67b08f57d0dbcaf99661ae0a1124d54e86f095f144992b7d0e7d099b1ba10

data/VERSION

@@ -1 +1 @@
-2.5.1
+2.5.3

data/lib/javonet-ruby-sdk/Binaries/Native/Linux/ARM64/version.txt

@@ -1 +1 @@
-2.5.1
+2.5.3

data/lib/javonet-ruby-sdk/Binaries/Native/Linux/X64/NativeUtilsUnitTests.xml

@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites tests="16" failures="0" disabled="0" errors="0" time="3.998" timestamp="2024-10-11T06:08:58.560" name="AllTests">
-  <testsuite name="Unit" tests="16" failures="0" disabled="0" skipped="0" errors="0" time="3.998" timestamp="2024-10-11T06:08:58.560">
-    <testcase name="Activation_Activate_correct_credentials" file="/home/vsts/work/1/s/src/native/UnitTests/ActivationTests.cpp" line="8" status="run" result="completed" time="2.291" timestamp="2024-10-11T06:08:58.560" classname="Unit" />
-    <testcase name="Activation_Activate_javonet_lic_exists" file="/home/vsts/work/1/s/src/native/UnitTests/ActivationTests.cpp" line="15" status="run" result="completed" time="0.033" timestamp="2024-10-11T06:09:00.852" classname="Unit" />
-    <testcase name="Activation_Activate_incorrect_license_key" file="/home/vsts/work/1/s/src/native/UnitTests/ActivationTests.cpp" line="21" status="run" result="completed" time="0.616" timestamp="2024-10-11T06:09:00.885" classname="Unit" />
-    <testcase name="ConfigFileReader_ExisitingFile" file="/home/vsts/work/1/s/src/native/UnitTests/ConfigFileReaderTests.cpp" line="8" status="run" result="completed" time="0." timestamp="2024-10-11T06:09:01.503" classname="Unit" />
-    <testcase name="SetConfigSource_MissingFile" file="/home/vsts/work/1/s/src/native/UnitTests/ConfigFileReaderTests.cpp" line="13" status="run" result="completed" time="0.517" timestamp="2024-10-11T06:09:01.503" classname="Unit" />
-    <testcase name="ConfigFileReader_GetLicenseKey" file="/home/vsts/work/1/s/src/native/UnitTests/ConfigFileReaderTests.cpp" line="33" status="run" result="completed" time="0." timestamp="2024-10-11T06:09:02.021" classname="Unit" />
-    <testcase name="ConfigFileReader_GetRuntimeName_Jvm" file="/home/vsts/work/1/s/src/native/UnitTests/ConfigFileReaderTests.cpp" line="39" status="run" result="completed" time="0." timestamp="2024-10-11T06:09:02.021" classname="Unit" />
-    <testcase name="ConfigFileReader_GetRuntimeName_Netcore" file="/home/vsts/work/1/s/src/native/UnitTests/ConfigFileReaderTests.cpp" line="45" status="run" result="completed" time="0." timestamp="2024-10-11T06:09:02.021" classname="Unit" />
-    <testcase name="ConfigFileReader_GetRuntimeType_MissingType" file="/home/vsts/work/1/s/src/native/UnitTests/ConfigFileReaderTests.cpp" line="51" status="run" result="completed" time="0.515" timestamp="2024-10-11T06:09:02.022" classname="Unit" />
-    <testcase name="ConfigFileReader_GetChannelType_Jvm" file="/home/vsts/work/1/s/src/native/UnitTests/ConfigFileReaderTests.cpp" line="69" status="run" result="completed" time="0." timestamp="2024-10-11T06:09:02.537" classname="Unit" />
-    <testcase name="ConfigFileReader_GetChannelType_Netcore" file="/home/vsts/work/1/s/src/native/UnitTests/ConfigFileReaderTests.cpp" line="75" status="run" result="completed" time="0." timestamp="2024-10-11T06:09:02.538" classname="Unit" />
-    <testcase name="ConfigFileReader_GetChannelHost_Jvm" file="/home/vsts/work/1/s/src/native/UnitTests/ConfigFileReaderTests.cpp" line="81" status="run" result="completed" time="0." timestamp="2024-10-11T06:09:02.538" classname="Unit" />
-    <testcase name="ConfigFileReader_GetChannelHost_Netcore" file="/home/vsts/work/1/s/src/native/UnitTests/ConfigFileReaderTests.cpp" line="88" status="run" result="completed" time="0." timestamp="2024-10-11T06:09:02.539" classname="Unit" />
-    <testcase name="ConfigFileReader_GetChannelPort_Jvm" file="/home/vsts/work/1/s/src/native/UnitTests/ConfigFileReaderTests.cpp" line="95" status="run" result="completed" time="0.001" timestamp="2024-10-11T06:09:02.539" classname="Unit" />
-    <testcase name="ConfigFileReader_GetChannelPort_Netcore" file="/home/vsts/work/1/s/src/native/UnitTests/ConfigFileReaderTests.cpp" line="102" status="run" result="completed" time="0." timestamp="2024-10-11T06:09:02.540" classname="Unit" />
-    <testcase name="AppInsightLogger" file="/home/vsts/work/1/s/src/native/UnitTests/LoggingTests.cpp" line="4" status="run" result="completed" time="0.017" timestamp="2024-10-11T06:09:02.541" classname="Unit" />
+<testsuites tests="16" failures="0" disabled="0" errors="0" time="4.574" timestamp="2024-11-04T20:08:09.557" name="AllTests">
+  <testsuite name="Unit" tests="16" failures="0" disabled="0" skipped="0" errors="0" time="4.574" timestamp="2024-11-04T20:08:09.557">
+    <testcase name="Activation_Activate_correct_credentials" file="/home/vsts/work/1/s/src/native/UnitTests/ActivationTests.cpp" line="8" status="run" result="completed" time="2.808" timestamp="2024-11-04T20:08:09.557" classname="Unit" />
+    <testcase name="Activation_Activate_javonet_lic_exists" file="/home/vsts/work/1/s/src/native/UnitTests/ActivationTests.cpp" line="15" status="run" result="completed" time="0.027" timestamp="2024-11-04T20:08:12.365" classname="Unit" />
+    <testcase name="Activation_Activate_incorrect_license_key" file="/home/vsts/work/1/s/src/native/UnitTests/ActivationTests.cpp" line="21" status="run" result="completed" time="0.655" timestamp="2024-11-04T20:08:12.392" classname="Unit" />
+    <testcase name="ConfigFileReader_ExisitingFile" file="/home/vsts/work/1/s/src/native/UnitTests/ConfigFileReaderTests.cpp" line="8" status="run" result="completed" time="0." timestamp="2024-11-04T20:08:13.047" classname="Unit" />
+    <testcase name="SetConfigSource_MissingFile" file="/home/vsts/work/1/s/src/native/UnitTests/ConfigFileReaderTests.cpp" line="13" status="run" result="completed" time="0.533" timestamp="2024-11-04T20:08:13.047" classname="Unit" />
+    <testcase name="ConfigFileReader_GetLicenseKey" file="/home/vsts/work/1/s/src/native/UnitTests/ConfigFileReaderTests.cpp" line="33" status="run" result="completed" time="0." timestamp="2024-11-04T20:08:13.581" classname="Unit" />
+    <testcase name="ConfigFileReader_GetRuntimeName_Jvm" file="/home/vsts/work/1/s/src/native/UnitTests/ConfigFileReaderTests.cpp" line="39" status="run" result="completed" time="0." timestamp="2024-11-04T20:08:13.582" classname="Unit" />
+    <testcase name="ConfigFileReader_GetRuntimeName_Netcore" file="/home/vsts/work/1/s/src/native/UnitTests/ConfigFileReaderTests.cpp" line="45" status="run" result="completed" time="0." timestamp="2024-11-04T20:08:13.582" classname="Unit" />
+    <testcase name="ConfigFileReader_GetRuntimeType_MissingType" file="/home/vsts/work/1/s/src/native/UnitTests/ConfigFileReaderTests.cpp" line="51" status="run" result="completed" time="0.527" timestamp="2024-11-04T20:08:13.583" classname="Unit" />
+    <testcase name="ConfigFileReader_GetChannelType_Jvm" file="/home/vsts/work/1/s/src/native/UnitTests/ConfigFileReaderTests.cpp" line="69" status="run" result="completed" time="0." timestamp="2024-11-04T20:08:14.110" classname="Unit" />
+    <testcase name="ConfigFileReader_GetChannelType_Netcore" file="/home/vsts/work/1/s/src/native/UnitTests/ConfigFileReaderTests.cpp" line="75" status="run" result="completed" time="0." timestamp="2024-11-04T20:08:14.110" classname="Unit" />
+    <testcase name="ConfigFileReader_GetChannelHost_Jvm" file="/home/vsts/work/1/s/src/native/UnitTests/ConfigFileReaderTests.cpp" line="81" status="run" result="completed" time="0." timestamp="2024-11-04T20:08:14.111" classname="Unit" />
+    <testcase name="ConfigFileReader_GetChannelHost_Netcore" file="/home/vsts/work/1/s/src/native/UnitTests/ConfigFileReaderTests.cpp" line="88" status="run" result="completed" time="0." timestamp="2024-11-04T20:08:14.111" classname="Unit" />
+    <testcase name="ConfigFileReader_GetChannelPort_Jvm" file="/home/vsts/work/1/s/src/native/UnitTests/ConfigFileReaderTests.cpp" line="95" status="run" result="completed" time="0." timestamp="2024-11-04T20:08:14.112" classname="Unit" />
+    <testcase name="ConfigFileReader_GetChannelPort_Netcore" file="/home/vsts/work/1/s/src/native/UnitTests/ConfigFileReaderTests.cpp" line="102" status="run" result="completed" time="0." timestamp="2024-11-04T20:08:14.112" classname="Unit" />
+    <testcase name="AppInsightLogger" file="/home/vsts/work/1/s/src/native/UnitTests/LoggingTests.cpp" line="4" status="run" result="completed" time="0.018" timestamp="2024-11-04T20:08:14.113" classname="Unit" />
   </testsuite>
 </testsuites>

data/lib/javonet-ruby-sdk/Binaries/Native/Linux/X64/version.txt

@@ -1 +1 @@
-2.5.1
+2.5.3

data/lib/javonet-ruby-sdk/Binaries/Native/MacOs/X64/version.txt

@@ -1 +1 @@
-2.5.1
+2.5.3

data/lib/javonet-ruby-sdk/Binaries/Native/Windows/X64/version.txt

@@ -1 +1 @@
-'2.5.1' 
+'2.5.3' 

data/lib/javonet-ruby-sdk/Binaries/Native/Windows/X86/version.txt

@@ -1 +1 @@
-'2.5.1' 
+'2.5.3' 

data/lib/javonet-ruby-sdk/Binaries/Nodejs/core/interpreter/Interpreter.js

@@ -10,36 +10,55 @@ let Receiver
 class Interpreter {
     handler = new Handler()
 
-    execute(command, connectionType, tcpAddress) {
-        let commandSerializer = new CommandSerializer()
-        let byteMessage = commandSerializer.serialize(command,connectionType, tcpAddress)
-        let responseByteArray
-
-        if (command.runtimeName === Runtime.Nodejs && connectionType === ConnectionType.IN_MEMORY)
-        {
-            // lazy receiver loading
-            if (!Receiver) {
-                Receiver = require('../receiver/Receiver')
-            }
-            responseByteArray = Receiver.sendCommand(byteMessage)
+    async executeAsync(command, connectionData) {
+        try {
+            const messageByteArray = new CommandSerializer().serialize(command, connectionData)
+
+            if (connectionData.connectionType === ConnectionType.WEB_SOCKET) {
+                const { WebSocketClient } = require("../webSocketClient/WebSocketClient");
+                const wsClient = new WebSocketClient(connectionData.hostname, null)
 
+                const responseByteArray = await wsClient.send(messageByteArray)
+                return new CommandDeserializer(responseByteArray).deserialize()
+            }
+            else {
+                return this.execute(command, connectionData)
+            }
+        } catch (error) {
+            // TODO: handle error exception log?
         }
-        else {
-            // lazy transmitter loading
-            if (!Transmitter) {
-                Transmitter = require('../transmitter/Transmitter')
+    }
+    
+    execute(command, connectionData) {
+        try {
+            let messageByteArray = new CommandSerializer().serialize(command, connectionData)
+            let responseByteArray
+            
+            if (command.runtimeName === Runtime.Nodejs && connectionData.connectionType === ConnectionType.IN_MEMORY)
+            {
+                // lazy receiver loading
+                if (!Receiver) {
+                    Receiver = require('../receiver/Receiver')
+                }
+                responseByteArray = Receiver.sendCommand(messageByteArray)
+
+            }
+            else {
+                // lazy transmitter loading
+                if (!Transmitter) {
+                    Transmitter = require('../transmitter/Transmitter')
+                }
+                responseByteArray = Transmitter.sendCommand(messageByteArray)
             }
-            responseByteArray = Transmitter.sendCommand(byteMessage)
+            return new CommandDeserializer(responseByteArray).deserialize()
+        } catch (error) {
+            // TODO: handle error exception log?
         }
-        return new CommandDeserializer(responseByteArray).deserialize()
     }
 
-    process(byteArray) {
-        let commandDeserializer = new CommandDeserializer(byteArray)
-        let receivedCommand = commandDeserializer.deserialize()
-        let responseCommand = this.handler.handleCommand(receivedCommand)
-        let commandSerializer = new CommandSerializer()
-        return commandSerializer.serialize(responseCommand, ConnectionType.IN_MEMORY)
+    process(messageByteArray) {
+        let receivedCommand = new CommandDeserializer(messageByteArray).deserialize()
+        return this.handler.handleCommand(receivedCommand)
     }
 }
 

data/lib/javonet-ruby-sdk/Binaries/Nodejs/core/protocol/CommandSerializer.js

@@ -1,62 +1,30 @@
 const Command = require("../../utils/Command")
 const TypeEncoder = require('./TypeSerializer')
-const ConnectionType = require("../../utils/ConnectionType");
 const Runtime = require('../../utils/RuntimeName')
 
 class CommandSerializer {
     buffer = new Int8Array(2)
 
-    serialize(command, connectionType, tcpConnectionData = null, runtimeVersion = 0) {
-        let deque = [command]
-        this.buffer[0] = command.runtimeName
-        this.buffer[1] = runtimeVersion
-        this.#insertIntoBuffer(this.#serialize_tcp(connectionType, tcpConnectionData))
-        this.#insertIntoBuffer(new Int8Array([Runtime.Nodejs, command.commandType]))
-        return this.#encodeRecursively(deque)
-    }
 
-    #serialize_tcp = function(connectionType, tcpConnectionData) {
-        let encodedTcp = new Int8Array(7)
-        encodedTcp[0] = connectionType
-        if (connectionType === ConnectionType.IN_MEMORY || tcpConnectionData === null) {
-            encodedTcp[1] = 0
-            encodedTcp[2] = 0
-            encodedTcp[3] = 0
-            encodedTcp[4] = 0
-            encodedTcp[5] = 0
-            encodedTcp[6] = 0
-        }
-        else if (ConnectionType.TCP === connectionType) {
-            let address = tcpConnectionData.getAddressBytes()
-            let port = tcpConnectionData.getPortBytes()
-            encodedTcp[1] = address[0]
-            encodedTcp[2] = address[1]
-            encodedTcp[3] = address[2]
-            encodedTcp[4] = address[3]
-            encodedTcp[5] = port[0]
-            encodedTcp[6] = port[1]
-        }
-        return encodedTcp
+    serialize(root_command, connectionData, runtimeVersion = 0) {
+        this.buffer[0] = root_command.runtimeName
+        this.buffer[1] = runtimeVersion
+        this.#insertIntoBuffer(connectionData.serializeConnectionData())
+        this.#insertIntoBuffer(new Int8Array([Runtime.Nodejs, root_command.commandType]))
+        this.#serializeRecursively(root_command)
+        return this.buffer
     }
 
-    #encodeRecursively = function(deque) {
-        if (deque.length === 0) return this.buffer;
-        let cmd = deque.pop()
-        deque.push(cmd.dropFirstPayloadArg())
-        if (cmd.payload.length > 0) {
-            if (cmd.payload[0] instanceof Command) {
-                let innerCommand = cmd.payload[0]
-                this.#insertIntoBuffer(TypeEncoder.serializeCommand(innerCommand))
-                deque.push(innerCommand)
+    #serializeRecursively = function(root_command) {
+        for (let cmd of root_command.payload) {
+            if (cmd instanceof Command) {
+                this.#insertIntoBuffer(TypeEncoder.serializeCommand(cmd))
+                this.#serializeRecursively(cmd)
             } else {
-                let result = TypeEncoder.encodePrimitive(cmd.payload[0])
+                let result = TypeEncoder.encodePrimitive(cmd)
                 this.#insertIntoBuffer(result)
             }
-            return this.#encodeRecursively(deque)
-        } else {
-            deque.pop()
         }
-        return this.#encodeRecursively(deque)
     }
 
     #insertIntoBuffer = function(arg) {

data/lib/javonet-ruby-sdk/Binaries/Nodejs/core/receiver/Receiver.js

@@ -1,9 +1,19 @@
 const Interpreter = require('../interpreter/Interpreter')
-const interpreter = new Interpreter()
+const CommandSerializer = require("../protocol/CommandSerializer");
+const InMemoryConnectionData = require("../../utils/connectionData/InMemoryConnectionData");
+const RuntimeLogger = require("../../utils/RuntimeLogger");
+
+
 
 class Receiver {
+
+    static connectionData = new InMemoryConnectionData();
+    Receiver() {
+        RuntimeLogger.printRuntimeInfo()
+    }
+
     static sendCommand(messageByteArray) {
-        return interpreter.process(messageByteArray)
+        return new CommandSerializer().serialize(new Interpreter().process(messageByteArray), this.connectionData)
     }
     static heartBeat(messageByteArray) {
         let response = new Int8Array(2)

data/lib/javonet-ruby-sdk/Binaries/Nodejs/core/transmitter/Transmitter.js

@@ -6,20 +6,8 @@ class Transmitter {
         return wrapper.sendCommand(messageArray)
     }
 
-    static #activate = function(licenseKey = "", proxyHost = "", proxyUserName="", proxyUserPassword="") {
-        return wrapper.activate(licenseKey, proxyHost, proxyUserName, proxyUserPassword)
-    }
-
-    static activateWithLicenseFile() {
-        return this.#activate()
-    }
-
-    static activateWithCredentials(licenseKey) {
-        return this.#activate(licenseKey)
-    }
-
-    static activateWithCredentialsAndProxy(licenseKey, proxyHost, proxyUserName, proxyUserPassword) {
-        return this.#activate(licenseKey, proxyHost, proxyUserName, proxyUserPassword)
+    static activate = function(licenseKey = "") {
+        return wrapper.activate(licenseKey, "", "", "")
     }
 
     static setConfigSource(configSource) {

data/lib/javonet-ruby-sdk/Binaries/Nodejs/core/transmitter/TransmitterWrapper.js

@@ -22,7 +22,7 @@ class TransmitterWrapper {
     }
 
     static setConfigSource(configSource) {
-        return library.setConfigSource(configSource)
+        //return library.setConfigSource(configSource)
     }
 }