javonet-ruby-sdk 2.5.1 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f10d0288c84dc4df8428dee8f95d7af6811628d76933139cec2657b5261710ec
-  data.tar.gz: fe3cad81c19333ee2a0efd9a594b8a5e92acae6efcf585ec397aeb307bacd2f6
+  metadata.gz: cb3843ed9810bc426f45582b036f79df5a92572a09af92491ab6903ce17427c1
+  data.tar.gz: 2f3570a2ec5c927c96f929e4af7efe87de66eef6824ab7f4992a521d6da3e0a0
 SHA512:
-  metadata.gz: c1aa0db8e48782693f02cafb63061fb18002d5da1335b96b694064e2337bf42e48ba45850c0fc7ef6a9e19d98f9e52c43fedd26976510216904f29f17dd905fe
-  data.tar.gz: 6cdf6fa48832c57cefc951805e9ebfac384d1471c1882537511477024d995e3ff0c001fdb6fb296b71343e5547c88b21b81e6adb560f56461af6288a525f31e1
+  metadata.gz: 9db01a163ba0da8089467db2d77956c50e45a3e8bd744cbe3c832260c08b5a55340b893ce792b08afb05e25c258adda33ec20b3849770dcb455a557ab8e85a52
+  data.tar.gz: b2b290f601bc1150a6bc052e981ad7e462530e7900d70ccdaffec3b6006e63367c595cf9c969ac50a951fa108d8b22582f23742281984a660a39d53a9c812f07

data/VERSION

@@ -1 +1 @@
-2.5.1
+2.5.2

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

@@ -1 +1 @@
-2.5.1
+2.5.2

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.54" timestamp="2024-10-24T18:58:25.834" name="AllTests">
+  <testsuite name="Unit" tests="16" failures="0" disabled="0" skipped="0" errors="0" time="4.54" timestamp="2024-10-24T18:58:25.834">
+    <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.451" timestamp="2024-10-24T18:58:25.834" 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.038" timestamp="2024-10-24T18:58:28.285" 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.934" timestamp="2024-10-24T18:58:28.324" 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-24T18:58:29.258" 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.538" timestamp="2024-10-24T18:58:29.258" 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-24T18:58:29.797" 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-24T18:58:29.798" 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-24T18:58:29.798" 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.545" timestamp="2024-10-24T18:58:29.798" 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-24T18:58:30.344" 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-24T18:58:30.345" 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-24T18:58:30.346" 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-24T18:58:30.346" 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-10-24T18:58:30.347" 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-24T18:58:30.347" classname="Unit" />
+    <testcase name="AppInsightLogger" file="/home/vsts/work/1/s/src/native/UnitTests/LoggingTests.cpp" line="4" status="run" result="completed" time="0.026" timestamp="2024-10-24T18:58:30.348" classname="Unit" />
   </testsuite>
 </testsuites>

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

@@ -1 +1 @@
-2.5.1
+2.5.2

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

@@ -1 +1 @@
-2.5.1
+2.5.2

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

@@ -1 +1 @@
-'2.5.1' 
+'2.5.2' 

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

@@ -1 +1 @@
-'2.5.1' 
+'2.5.2' 

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,45 +1,21 @@
 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) {
+
+    serialize(command, connectionData, runtimeVersion = 0) {
         let deque = [command]
         this.buffer[0] = command.runtimeName
         this.buffer[1] = runtimeVersion
-        this.#insertIntoBuffer(this.#serialize_tcp(connectionType, tcpConnectionData))
+        this.#insertIntoBuffer(connectionData.serializeConnectionData())
         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
+        return this.#serializeRecursively(deque)
     }
 
-    #encodeRecursively = function(deque) {
+    #serializeRecursively = function(deque) {
         if (deque.length === 0) return this.buffer;
         let cmd = deque.pop()
         deque.push(cmd.dropFirstPayloadArg())
@@ -52,11 +28,11 @@ class CommandSerializer {
                 let result = TypeEncoder.encodePrimitive(cmd.payload[0])
                 this.#insertIntoBuffer(result)
             }
-            return this.#encodeRecursively(deque)
+            return this.#serializeRecursively(deque)
         } else {
             deque.pop()
         }
-        return this.#encodeRecursively(deque)
+        return this.#serializeRecursively(deque)
     }
 
     #insertIntoBuffer = function(arg) {

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

@@ -1,9 +1,14 @@
 const Interpreter = require('../interpreter/Interpreter')
+const CommandSerializer = require("../protocol/CommandSerializer");
+const InMemoryConnectionData = require("../../utils/connectionData/InMemoryConnectionData");
 const interpreter = new Interpreter()
 
 class Receiver {
+
+    static connectionData = new InMemoryConnectionData();
+
     static sendCommand(messageByteArray) {
-        return interpreter.process(messageByteArray)
+        return new CommandSerializer().serialize(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) {