javonet-nodejs-sdk 2.2.0 → 2.4.0

package/Binaries/Native/Linux/X64/version.txt

@@ -1 +1 @@
-2.2.0
+2.4.0

package/Binaries/Native/MacOs/X64/version.txt

@@ -1 +1 @@
-2.2.0
+2.4.0

package/Binaries/Native/Windows/X64/version.txt

@@ -1 +1 @@
-'2.2.0' 
+'2.4.0' 

package/Binaries/Nodejs/Linux/X64/core/interpreter/Interpreter.js

@@ -2,6 +2,7 @@ const { Handler } = require('../handler/Handler')
 const CommandSerializer = require('../protocol/CommandSerializer')
 const CommandDeserializer = require('../protocol/CommandDeserializer')
 const Runtime = require("../../utils/RuntimeName");
+const ConnectionType = require('../../utils/ConnectionType');
 
 let Transmitter
 let Receiver
@@ -14,7 +15,7 @@ class Interpreter {
         let byteMessage = commandSerializer.serialize(command,connectionType, tcpAddress)
         let responseByteArray
 
-        if (command.runtimeName === Runtime.Nodejs)
+        if (command.runtimeName === Runtime.Nodejs && connectionType === ConnectionType.IN_MEMORY)
         {
             // lazy receiver loading
             if (!Receiver) {
@@ -38,7 +39,7 @@ class Interpreter {
         let receivedCommand = commandDeserializer.deserialize()
         let responseCommand = this.handler.handleCommand(receivedCommand)
         let commandSerializer = new CommandSerializer()
-        return commandSerializer.serialize(responseCommand, 0, "0.0.0.0:0")
+        return commandSerializer.serialize(responseCommand, ConnectionType.IN_MEMORY)
     }
 }
 

package/Binaries/Nodejs/Linux/X64/core/protocol/CommandSerializer.js

@@ -5,40 +5,38 @@ const Runtime = require('../../utils/RuntimeName')
 
 class CommandSerializer {
     buffer = new Int8Array(2)
-    encodedTcp;
 
-    serialize(command, connectionType, tcpConnectionData, runtimeVersion = 0) {
+    serialize(command, connectionType, tcpConnectionData = null, runtimeVersion = 0) {
         let deque = [command]
         this.buffer[0] = command.runtimeName
         this.buffer[1] = runtimeVersion
-        this.#insertIntoBuffer(this.#encodeTcpConnection(connectionType, tcpConnectionData))
+        this.#insertIntoBuffer(this.#serialize_tcp(connectionType, tcpConnectionData))
         this.#insertIntoBuffer(new Int8Array([Runtime.Nodejs, command.commandType]))
         return this.#encodeRecursively(deque)
     }
 
-    #encodeTcpConnection = function(connectionType, tcpConnectionData) {
-        this.encodedTcp = new Int8Array(7)
-        if (ConnectionType.IN_MEMORY === connectionType) {
-            this.encodedTcp[0] = ConnectionType.IN_MEMORY.valueOf()
-            for (let i = 1; i < this.encodedTcp.length; i++) {
-                this.encodedTcp[i] = 0
-            }
-            return this.encodedTcp
+    #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) {
-            this.encodedTcp[0] = ConnectionType.TCP.valueOf()
-            let port = tcpConnectionData.get_port();
-            let hostname = tcpConnectionData.get_hostname();
-            let split_hostname = hostname.split(".");
-
-            for (let i = 0; i < split_hostname.length; i++) {
-                this.encodedTcp[i + 1] = split_hostname[i]
-            }
-            this.encodedTcp.push(new Int8Array.of(
-                port,
-                (port >>> 8 & 0xFF)))
-            return this.encodedTcp
+            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
     }
 
     #encodeRecursively = function(deque) {

package/Binaries/Nodejs/Linux/X64/core/transmitter/Transmitter.js

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

package/Binaries/Nodejs/Linux/X64/core/transmitter/TransmitterWrapper.js

@@ -12,14 +12,18 @@ class TransmitterWrapper {
         return library.initializeTransmitter(binariesRootPath)
     }
 
-    static activate(licenceKey, proxyHost, proxyUserName, proxyUserPassword) {
+    static activate(licenseKey, proxyHost, proxyUserName, proxyUserPassword) {
         this.initialize()
-        return library.activate(licenceKey, proxyHost, proxyUserName, proxyUserPassword)
+        return library.activate(licenseKey, proxyHost, proxyUserName, proxyUserPassword)
     }
 
     static sendCommand(messageArray) {
         return library.sendCommand(messageArray)
     }
+
+    static setConfigSource(configSource) {
+        return library.setConfigSource(configSource)
+    }
 }
 
 module.exports = TransmitterWrapper

package/Binaries/Nodejs/Linux/X64/utils/RuntimeNameHandler.js

@@ -0,0 +1,30 @@
+const RuntimeName = require('./RuntimeName');
+
+class RuntimeNameHandler {
+    static getName(runtimeName) {
+        switch (runtimeName) {
+            case RuntimeName.Clr:
+                return "clr";
+            case RuntimeName.Go:
+                return "go";
+            case RuntimeName.Jvm:
+                return "jvm";
+            case RuntimeName.Netcore:
+                return "netcore";
+            case RuntimeName.Perl:
+                return "perl";
+            case RuntimeName.Python:
+                return "python";
+            case RuntimeName.Ruby:
+                return "ruby";
+            case RuntimeName.Nodejs:
+                return "nodejs";
+            case RuntimeName.Cpp:
+                return "cpp";
+            default:
+                throw new Error("Invalid runtime name.");
+        }
+    }
+}
+
+module.exports = RuntimeNameHandler;

package/Binaries/Nodejs/Linux/X64/utils/TcpConnectionData.js

@@ -1,12 +1,49 @@
+const dns = require('dns');
+
 class TcpConnectionData {
+
     constructor(hostname, port) {
-        this.hostname = hostname
-        this.port = port
+        this.port = port;
+        if (hostname === "localhost") {
+            this.ipAddress = "127.0.0.1";
+        } else {
+            this.ipAddress = this.resolveIpAddress(hostname);
+        }
     }
-    get_hostname() { return this.hostname }
 
-    get_port() { return this.port }
-}
+    equals(other) {
+        if (other instanceof TcpConnectionData) {
+            return this.ipAddress === other.ipAddress && this.port === other.port;
+        }
+        return false;
+    }
+
+    resolveIpAddress(hostname) {
+        // Check if the input is an IP address
+        const ipPattern = /^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/;
+        if (ipPattern.test(hostname)) {
+            // If it's an IP address, return it directly
+            return hostname;
+        } else {
+            // If it's not an IP address, try to resolve it as a hostname
+            return dns.resolve4(hostname, (err, addresses) => {
+                if (err) {
+                    console.error(err);
+                    return null;
+                }
+                return addresses[0];
+            });
+        }
+    }
+
+    getAddressBytes() {
+        return this.ipAddress.split('.').map(Number);
+    }
 
+    getPortBytes() {
+        return [this.port & 0xFF, this.port >> 8];
+    }
+    
+}
 
-module.exports = TcpConnectionData
+module.exports = TcpConnectionData;

package/Binaries/Nodejs/MacOs/X64/core/interpreter/Interpreter.js

@@ -2,6 +2,7 @@ const { Handler } = require('../handler/Handler')
 const CommandSerializer = require('../protocol/CommandSerializer')
 const CommandDeserializer = require('../protocol/CommandDeserializer')
 const Runtime = require("../../utils/RuntimeName");
+const ConnectionType = require('../../utils/ConnectionType');
 
 let Transmitter
 let Receiver
@@ -14,7 +15,7 @@ class Interpreter {
         let byteMessage = commandSerializer.serialize(command,connectionType, tcpAddress)
         let responseByteArray
 
-        if (command.runtimeName === Runtime.Nodejs)
+        if (command.runtimeName === Runtime.Nodejs && connectionType === ConnectionType.IN_MEMORY)
         {
             // lazy receiver loading
             if (!Receiver) {
@@ -38,7 +39,7 @@ class Interpreter {
         let receivedCommand = commandDeserializer.deserialize()
         let responseCommand = this.handler.handleCommand(receivedCommand)
         let commandSerializer = new CommandSerializer()
-        return commandSerializer.serialize(responseCommand, 0, "0.0.0.0:0")
+        return commandSerializer.serialize(responseCommand, ConnectionType.IN_MEMORY)
     }
 }
 

package/Binaries/Nodejs/MacOs/X64/core/protocol/CommandSerializer.js

@@ -5,40 +5,38 @@ const Runtime = require('../../utils/RuntimeName')
 
 class CommandSerializer {
     buffer = new Int8Array(2)
-    encodedTcp;
 
-    serialize(command, connectionType, tcpConnectionData, runtimeVersion = 0) {
+    serialize(command, connectionType, tcpConnectionData = null, runtimeVersion = 0) {
         let deque = [command]
         this.buffer[0] = command.runtimeName
         this.buffer[1] = runtimeVersion
-        this.#insertIntoBuffer(this.#encodeTcpConnection(connectionType, tcpConnectionData))
+        this.#insertIntoBuffer(this.#serialize_tcp(connectionType, tcpConnectionData))
         this.#insertIntoBuffer(new Int8Array([Runtime.Nodejs, command.commandType]))
         return this.#encodeRecursively(deque)
     }
 
-    #encodeTcpConnection = function(connectionType, tcpConnectionData) {
-        this.encodedTcp = new Int8Array(7)
-        if (ConnectionType.IN_MEMORY === connectionType) {
-            this.encodedTcp[0] = ConnectionType.IN_MEMORY.valueOf()
-            for (let i = 1; i < this.encodedTcp.length; i++) {
-                this.encodedTcp[i] = 0
-            }
-            return this.encodedTcp
+    #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) {
-            this.encodedTcp[0] = ConnectionType.TCP.valueOf()
-            let port = tcpConnectionData.get_port();
-            let hostname = tcpConnectionData.get_hostname();
-            let split_hostname = hostname.split(".");
-
-            for (let i = 0; i < split_hostname.length; i++) {
-                this.encodedTcp[i + 1] = split_hostname[i]
-            }
-            this.encodedTcp.push(new Int8Array.of(
-                port,
-                (port >>> 8 & 0xFF)))
-            return this.encodedTcp
+            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
     }
 
     #encodeRecursively = function(deque) {

package/Binaries/Nodejs/MacOs/X64/core/transmitter/Transmitter.js

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

package/Binaries/Nodejs/MacOs/X64/core/transmitter/TransmitterWrapper.js

@@ -12,14 +12,18 @@ class TransmitterWrapper {
         return library.initializeTransmitter(binariesRootPath)
     }
 
-    static activate(licenceKey, proxyHost, proxyUserName, proxyUserPassword) {
+    static activate(licenseKey, proxyHost, proxyUserName, proxyUserPassword) {
         this.initialize()
-        return library.activate(licenceKey, proxyHost, proxyUserName, proxyUserPassword)
+        return library.activate(licenseKey, proxyHost, proxyUserName, proxyUserPassword)
     }
 
     static sendCommand(messageArray) {
         return library.sendCommand(messageArray)
     }
+
+    static setConfigSource(configSource) {
+        return library.setConfigSource(configSource)
+    }
 }
 
 module.exports = TransmitterWrapper

package/Binaries/Nodejs/MacOs/X64/utils/RuntimeNameHandler.js

@@ -0,0 +1,30 @@
+const RuntimeName = require('./RuntimeName');
+
+class RuntimeNameHandler {
+    static getName(runtimeName) {
+        switch (runtimeName) {
+            case RuntimeName.Clr:
+                return "clr";
+            case RuntimeName.Go:
+                return "go";
+            case RuntimeName.Jvm:
+                return "jvm";
+            case RuntimeName.Netcore:
+                return "netcore";
+            case RuntimeName.Perl:
+                return "perl";
+            case RuntimeName.Python:
+                return "python";
+            case RuntimeName.Ruby:
+                return "ruby";
+            case RuntimeName.Nodejs:
+                return "nodejs";
+            case RuntimeName.Cpp:
+                return "cpp";
+            default:
+                throw new Error("Invalid runtime name.");
+        }
+    }
+}
+
+module.exports = RuntimeNameHandler;

package/Binaries/Nodejs/MacOs/X64/utils/TcpConnectionData.js

@@ -1,12 +1,49 @@
+const dns = require('dns');
+
 class TcpConnectionData {
+
     constructor(hostname, port) {
-        this.hostname = hostname
-        this.port = port
+        this.port = port;
+        if (hostname === "localhost") {
+            this.ipAddress = "127.0.0.1";
+        } else {
+            this.ipAddress = this.resolveIpAddress(hostname);
+        }
     }
-    get_hostname() { return this.hostname }
 
-    get_port() { return this.port }
-}
+    equals(other) {
+        if (other instanceof TcpConnectionData) {
+            return this.ipAddress === other.ipAddress && this.port === other.port;
+        }
+        return false;
+    }
+
+    resolveIpAddress(hostname) {
+        // Check if the input is an IP address
+        const ipPattern = /^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/;
+        if (ipPattern.test(hostname)) {
+            // If it's an IP address, return it directly
+            return hostname;
+        } else {
+            // If it's not an IP address, try to resolve it as a hostname
+            return dns.resolve4(hostname, (err, addresses) => {
+                if (err) {
+                    console.error(err);
+                    return null;
+                }
+                return addresses[0];
+            });
+        }
+    }
+
+    getAddressBytes() {
+        return this.ipAddress.split('.').map(Number);
+    }
 
+    getPortBytes() {
+        return [this.port & 0xFF, this.port >> 8];
+    }
+    
+}
 
-module.exports = TcpConnectionData
+module.exports = TcpConnectionData;

package/Binaries/Nodejs/Windows/X64/core/interpreter/Interpreter.js

@@ -2,6 +2,7 @@ const { Handler } = require('../handler/Handler')
 const CommandSerializer = require('../protocol/CommandSerializer')
 const CommandDeserializer = require('../protocol/CommandDeserializer')
 const Runtime = require("../../utils/RuntimeName");
+const ConnectionType = require('../../utils/ConnectionType');
 
 let Transmitter
 let Receiver
@@ -14,7 +15,7 @@ class Interpreter {
         let byteMessage = commandSerializer.serialize(command,connectionType, tcpAddress)
         let responseByteArray
 
-        if (command.runtimeName === Runtime.Nodejs)
+        if (command.runtimeName === Runtime.Nodejs && connectionType === ConnectionType.IN_MEMORY)
         {
             // lazy receiver loading
             if (!Receiver) {
@@ -38,7 +39,7 @@ class Interpreter {
         let receivedCommand = commandDeserializer.deserialize()
         let responseCommand = this.handler.handleCommand(receivedCommand)
         let commandSerializer = new CommandSerializer()
-        return commandSerializer.serialize(responseCommand, 0, "0.0.0.0:0")
+        return commandSerializer.serialize(responseCommand, ConnectionType.IN_MEMORY)
     }
 }