javonet-ruby-sdk 2.1.12 → 2.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b245d7d85b23000868e4bf1aa29a089b5823da7784e2f61a84a8432063f2e2c
-  data.tar.gz: 6a724dd6c1611bbdc32447903a246f806f934ae7c58fd28d0b547fa4720e5c90
+  metadata.gz: af16c667c0296d6b9ee4be30b0fad325f1653043368b4daeb3d28218afd8198f
+  data.tar.gz: 3333d1f0ac31263b974bce7ea80f14da47c54d3fd6b96827618cd29977bc7a7a
 SHA512:
-  metadata.gz: 954b0ed1e65b408820d186285722e470918ed4449f5da32433bbe2f864f89664647d04cb256fa9242e447c0553bad1a0a2a7f95ec4357ef89fd3f3cf7686e3c5
-  data.tar.gz: f64a2dba204151ca1fb73ccbd872ae88605ae986c10df8d8c5c27438267e673bdbe0b348e02414d8264b4e96bce1cb4ea78edf1ffdef459350f1d60c217def84
+  metadata.gz: eefc0169f92a585c825165337d5361ab8a3abec003a3172d0360aac8d80b8ab98d416312e835a64d21c604c9c0bca32d726e90e7a0d80a7fe128be74c67d5766
+  data.tar.gz: 06750a356dda0e9c81a174aa199f147e9f8f87ee688863a0f6824e2dfe8ff09d411bbcfd8db95fcfe7dbfdf27a4d93cf072800fe5103b8b651622063ba896c05

data/Rakefile

@@ -3,7 +3,7 @@ require "rspec/core/rake_task"
 
 task :unitTest do
   RSpec::Core::RakeTask.new(:spec) do |t|
-    t.pattern = Dir.glob("spec/ruby/unit_test/")
+    t.pattern = Dir.glob("spec/unit_test/")
     t.rspec_opts = "--no-drb -r rspec_junit_formatter --format RspecJunitFormatter -o testresults/RubyUnitTest.xml"
     Rake.application.options.trace = true
   end
@@ -13,7 +13,7 @@ end
 
 task :performanceTest do
   RSpec::Core::RakeTask.new(:spec) do |t|
-    t.pattern = Dir.glob("spec/ruby/performance_test/")
+    t.pattern = Dir.glob("spec/performance_test/")
     t.rspec_opts = "--no-drb -r rspec_junit_formatter --format RspecJunitFormatter -o testresults/RubyPerformanceTest.xml"
     Rake.application.options.trace = true
   end
@@ -22,7 +22,7 @@ end
 
 task :functionalTest do
   RSpec::Core::RakeTask.new(:spec) do |t|
-    t.pattern = Dir.glob("spec/ruby/functional_test/")
+    t.pattern = Dir.glob("spec/functional_test/")
     t.rspec_opts = "--no-drb -r rspec_junit_formatter --format RspecJunitFormatter -o testresults/RubyFunctionalTest.xml"
     Rake.application.options.trace = true
   end

data/VERSION

@@ -1 +1 @@
-2.1.12
+2.1.13

data/javonet-ruby-sdk.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |spec|
   spec.summary        = "Javonet SDK for Ruby"
   spec.description    = "This is a Javonet SDK for Ruby"
   spec.authors        = ["SdNCenter Sp. z o. o."]
-  spec.email          = ["biuro@sdncenter.pl"]
+  spec.email          = ["support@javonet.com"]
   spec.homepage       = "https://javonet.com"
   spec.license        = "MIT"
 
@@ -21,17 +21,16 @@ Gem::Specification.new do |spec|
   spec.files += binaries
   spec.files += ["lib"]
 
-  spec.add_runtime_dependency "ffi"
-  spec.add_runtime_dependency "os"
-  spec.add_runtime_dependency "securerandom"
+  spec.add_runtime_dependency "ffi", '~> 1.16'
+  spec.add_runtime_dependency "os", '~> 1.1'
+  spec.add_runtime_dependency "securerandom", '~> 0.3.0'
   
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rspec_junit_formatter"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "simplecov-cobertura"
-  spec.add_development_dependency "http"
-  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency "bundler", '~> 2.4'
+  spec.add_development_dependency "rake", '~> 13.1'
+  spec.add_development_dependency "rspec", '~> 3.12'
+  spec.add_development_dependency "rspec_junit_formatter", '~> 0.6.0'
+  spec.add_development_dependency "simplecov", '~> 0.22.0'
+  spec.add_development_dependency "simplecov-cobertura", '~> 2.1'
+  spec.add_development_dependency "http", '~> 5.1'
   
 end

data/lib/javonet-ruby-sdk/Binaries/Native/Linux/X64/NetVersion80LatestPatch.runtimeconfig.json

@@ -0,0 +1,10 @@
+{
+  "runtimeOptions": {
+    "tfm": "net8.0",
+    "rollForward": "LatestPatch",
+    "framework": {
+      "name": "Microsoft.NETCore.App",
+      "version": "8.0.0"
+    }
+  }
+}

data/lib/javonet-ruby-sdk/Binaries/Native/Linux/X64/NetVersionLatest.runtimeconfig.json

@@ -1,10 +1,10 @@
 {
   "runtimeOptions": {
-    "tfm": "netcoreapp3.1",
+    "tfm": "net6.0",
     "rollForward": "LatestMajor",
     "framework": {
       "name": "Microsoft.NETCore.App",
-      "version": "3.1.0"
+      "version": "6.0.0"
     }
   }
 }

data/lib/javonet-ruby-sdk/Binaries/Native/MacOs/X64/NetVersion80LatestPatch.runtimeconfig.json

@@ -0,0 +1,10 @@
+{
+  "runtimeOptions": {
+    "tfm": "net8.0",
+    "rollForward": "LatestPatch",
+    "framework": {
+      "name": "Microsoft.NETCore.App",
+      "version": "8.0.0"
+    }
+  }
+}

data/lib/javonet-ruby-sdk/Binaries/Native/MacOs/X64/NetVersionLatest.runtimeconfig.json

@@ -1,10 +1,10 @@
 {
   "runtimeOptions": {
-    "tfm": "netcoreapp3.1",
+    "tfm": "net6.0",
     "rollForward": "LatestMajor",
     "framework": {
       "name": "Microsoft.NETCore.App",
-      "version": "3.1.0"
+      "version": "6.0.0"
     }
   }
 }

data/lib/javonet-ruby-sdk/Binaries/Native/Windows/X64/NetVersion80LatestPatch.runtimeconfig.json

@@ -0,0 +1,10 @@
+{
+  "runtimeOptions": {
+    "tfm": "net8.0",
+    "rollForward": "LatestPatch",
+    "framework": {
+      "name": "Microsoft.NETCore.App",
+      "version": "8.0.0"
+    }
+  }
+}

data/lib/javonet-ruby-sdk/Binaries/Native/Windows/X64/NetVersionLatest.runtimeconfig.json

@@ -1,10 +1,10 @@
 {
   "runtimeOptions": {
-    "tfm": "netcoreapp3.1",
+    "tfm": "net6.0",
     "rollForward": "LatestMajor",
     "framework": {
       "name": "Microsoft.NETCore.App",
-      "version": "3.1.0"
+      "version": "6.0.0"
     }
   }
 }

data/lib/javonet-ruby-sdk/Binaries/Nodejs/Linux/X64/core/handler/ValueHandler.js

@@ -2,6 +2,10 @@ const AbstractHandler = require("./AbstractHandler")
 
 
 class ValueHandler extends AbstractHandler {
+
+    constructor() {
+        super()
+    }
     process(command) {
         const {payload} = command
         return payload[0]

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

@@ -1,21 +1,27 @@
 const { Handler } = require('../handler/Handler')
-const CommandEncoder = require('../protocol/CommandEncoder')
-const CommandDecoder = require('../protocol/CommandDecoder')
+const CommandSerializer = require('../protocol/CommandSerializer')
+const CommandDeserializer = require('../protocol/CommandDeserializer')
 const Runtime = require("../../utils/RuntimeName");
 
 let Transmitter
+let Receiver
 
 class Interpreter {
     handler = new Handler()
 
     execute(command, connectionType, tcpAddress) {
-        let commandEncoder = new CommandEncoder()
-        let byteMessage = commandEncoder.encode(command,connectionType, tcpAddress)
+        let commandSerializer = new CommandSerializer()
+        let byteMessage = commandSerializer.serialize(command,connectionType, tcpAddress)
         let responseByteArray
 
         if (command.runtimeName === Runtime.Nodejs)
         {
-            return this.process(byteMessage)
+            // lazy receiver loading
+            if (!Receiver) {
+                Receiver = require('../receiver/Receiver')
+            }
+            responseByteArray = Receiver.sendCommand(byteMessage)
+
         }
         else {
             // lazy transmitter loading
@@ -23,14 +29,16 @@ class Interpreter {
                 Transmitter = require('../transmitter/Transmitter')
             }
             responseByteArray = Transmitter.sendCommand(byteMessage)
-            return new CommandDecoder(responseByteArray).decode()
         }
+        return new CommandDeserializer(responseByteArray).deserialize()
     }
 
     process(byteArray) {
-        let decoder = new CommandDecoder(byteArray)
-        let command = decoder.decode()
-        return this.handler.handleCommand(command)
+        let commandDeserializer = new CommandDeserializer(byteArray)
+        let receivedCommand = commandDeserializer.deserialize()
+        let responseCommand = this.handler.handleCommand(receivedCommand)
+        let commandSerializer = new CommandSerializer()
+        return commandSerializer.serialize(responseCommand, 0, "0.0.0.0:0")
     }
 }
 

data/lib/javonet-ruby-sdk/Binaries/Nodejs/Linux/X64/core/protocol/CommandDeserializer.js

@@ -0,0 +1,160 @@
+const TypeDeserializer = require("./TypeDeserializer")
+const Command = require("../../utils/Command")
+const Type = require("../../utils/Type")
+const StringEncodingMode = require("../../utils/StringEncodingMode")
+
+
+class CommandDeserializer {
+    constructor(buffer) {
+        this.buffer = buffer
+        this.command = new Command(
+            buffer[0],
+            buffer[10],
+            []
+        )
+        this.position = 11
+    }
+
+    deserialize() {
+        while (!this.isAtEnd()) {
+            this.command = this.command.addArgToPayload((this.readObject(this.buffer[this.position])))
+        }
+        return this.command
+    }
+
+    isAtEnd() {
+        return this.position === this.buffer.length
+    }
+
+    readObject(typeNum) {
+        let type = Object.entries(Type).find(entry => entry[1] === typeNum)[0]
+        switch (type) {
+            case 'JAVONET_COMMAND':
+                return this.readCommand()
+            case 'JAVONET_STRING':
+                return this.readString()
+            case 'JAVONET_INTEGER':
+                return this.readInt()
+            case 'JAVONET_BOOLEAN':
+                return this.readBool();
+            case 'JAVONET_FLOAT':
+                return this.readFloat();
+            case 'JAVONET_BYTE':
+                return this.readByte();
+            case 'JAVONET_CHAR':
+                return this.readChar();
+            case 'JAVONET_LONG_LONG':
+                return this.readLongLong();
+            case 'JAVONET_DOUBLE':
+                return this.readDouble();
+            case 'JAVONET_UNSIGNED_LONG_LONG':
+                return this.readUllong
+            case 'JAVONET_UNSIGNED_INTEGER':
+                return this.readUInt()
+            default:
+                throw 'Unknown type - not supported in JavaScript'
+        }
+    }
+
+    readCommand() {
+        let p = this.position
+        let numberOfElementsInPayload = TypeDeserializer.deserializeInt(this.buffer.slice(p + 1, p + 5))
+        let runtime = this.buffer[p + 5]
+        let type = this.buffer[p + 6]
+        this.position += 7
+        let command = new Command(runtime, type, [])
+        return this.readCommandRecursively(numberOfElementsInPayload, command)
+    }
+
+    readCommandRecursively(numberOfElementsInPayloadLeft, cmd) {
+        if (numberOfElementsInPayloadLeft === 0) return cmd
+        let p = this.position
+        cmd = cmd.addArgToPayload(this.readObject(this.buffer[p]))
+        return this.readCommandRecursively(numberOfElementsInPayloadLeft - 1, cmd)
+    }
+
+    readString() {
+        let p = this.position
+        let stringEncodingMode = this.buffer[p + 1]
+        let size = TypeDeserializer.deserializeInt(this.buffer.slice(p + 2, p + 6))
+        this.position += 6
+        p = this.position
+        this.position += size
+        return TypeDeserializer.deserializeString(stringEncodingMode, this.buffer.slice(p, p + size))
+
+    }
+
+    readInt() {
+        let size = 4
+        this.position += 2
+        let p = this.position
+        this.position += size
+        return TypeDeserializer.deserializeInt(this.buffer.slice(p, p + size))
+    }
+
+    readBool() {
+        let size = 1
+        this.position += 2
+        let p = this.position
+        this.position += size
+        return TypeDeserializer.deserializeBool(this.buffer.slice(p, p + size))
+    }
+
+    readFloat() {
+        let size = 4
+        this.position += 2
+        let p = this.position
+        this.position += size
+        return TypeDeserializer.deserializeFloat(this.buffer.slice(p, p + size))
+    }
+
+    readByte() {
+        let size = 1
+        this.position += 2
+        let p = this.position
+        this.position += size
+        return TypeDeserializer.deserializeByte(this.buffer.slice(p, p + size))
+    }
+
+    readChar() {
+        let size = 1
+        this.position += 2
+        let p = this.position
+        this.position += size
+        return TypeDeserializer.deserializeChar(this.buffer.slice(p, p + size))
+    }
+
+    readLongLong() {
+        let size = 8
+        this.position += 2
+        let p = this.position
+        this.position += size
+        return TypeDeserializer.deserializeLongLong(this.buffer.slice(p, p + size))
+    }
+
+    readDouble() {
+        let size = 8
+        this.position += 2
+        let p = this.position
+        this.position += size
+        return TypeDeserializer.deserializeDouble(this.buffer.slice(p, p + size))
+    }
+
+    readUllong() {
+        let size = 8
+        this.position += 2
+        let p = this.position
+        this.position += size
+        return TypeDeserializer.deserializeULLong(this.buffer.slice(p, p + size))
+    }
+
+    readUInt() {
+        let size = 4
+        this.position += 2
+        let p = this.position
+        this.position += size
+        return TypeDeserializer.deserializeUInt(this.buffer.slice(p, p + size))
+    }
+}
+
+module.exports = CommandDeserializer

data/lib/javonet-ruby-sdk/Binaries/Nodejs/Linux/X64/core/protocol/{CommandEncoder.js → CommandSerializer.js}

@@ -1,13 +1,13 @@
 const Command = require("../../utils/Command")
-const TypeEncoder = require('./TypeEncoder')
+const TypeEncoder = require('./TypeSerializer')
 const ConnectionType = require("../../utils/ConnectionType");
 const Runtime = require('../../utils/RuntimeName')
 
-class CommandEncoder {
+class CommandSerializer {
     buffer = new Int8Array(2)
     encodedTcp;
 
-    encode(command, connectionType, tcpConnectionData, runtimeVersion = 0) {
+    serialize(command, connectionType, tcpConnectionData, runtimeVersion = 0) {
         let deque = [command]
         this.buffer[0] = command.runtimeName
         this.buffer[1] = runtimeVersion
@@ -48,7 +48,7 @@ class CommandEncoder {
         if (cmd.payload.length > 0) {
             if (cmd.payload[0] instanceof Command) {
                 let innerCommand = cmd.payload[0]
-                this.#insertIntoBuffer(TypeEncoder.encodeCommand(innerCommand))
+                this.#insertIntoBuffer(TypeEncoder.serializeCommand(innerCommand))
                 deque.push(innerCommand)
             } else {
                 let result = TypeEncoder.encodePrimitive(cmd.payload[0])
@@ -69,4 +69,4 @@ class CommandEncoder {
     }
 }
 
-module.exports = CommandEncoder
+module.exports = CommandSerializer

data/lib/javonet-ruby-sdk/Binaries/Nodejs/Linux/X64/core/protocol/TypeDeserializer.js

@@ -0,0 +1,77 @@
+const Command = require('../../utils/Command')
+const Type = require('../../utils/Type')
+const StringEncodingMode = require('../../utils/StringEncodingMode')
+const {TextDecoder} = require("util");
+
+class TypeDeserializer {
+    static deserializeCommand(encodedCommand) {
+        return new Command(encodedCommand[0], encodedCommand[1], [])
+    }
+
+    static deserializeString(stringEncodingMode, encodedString) {
+        switch (stringEncodingMode) {
+            case StringEncodingMode.ASCII:
+                return String.fromCharCode(...encodedString)
+            case StringEncodingMode.UTF8:
+                let decoder = new TextDecoder('UTF-8');
+                return decoder.decode(new Uint8Array(encodedString))
+            case StringEncodingMode.UTF16:
+                let str = "";
+                let newBuffer = new Uint8Array(encodedString)
+                for (let i = 0; i < newBuffer.length; i++) {
+                    newBuffer[i] = encodedString[i]
+                }
+                for (let i = 0; i < encodedString.length; i = i + 2) {
+                    str += String.fromCharCode(newBuffer[i] + 256 * newBuffer[i + 1])
+                }
+                return str;
+            case StringEncodingMode.UTF32:
+                throw "Type utf32-encoded string not supported in JavaScript"
+            default:
+                throw "Unknown string encoding - not supported in JavaScript";
+        }
+    }
+
+    static deserializeInt(encodedInt) {
+        return (
+            (encodedInt[0] & 0xFF)
+            | ((encodedInt[1] & 0xFF) << 8)
+            | ((encodedInt[2] & 0xFF) << 16)
+            | ((encodedInt[3] & 0xFF) << 24)
+        )
+    }
+
+    static deserializeBool(encodedBool) {
+        return encodedBool[0] === 1
+    }
+
+    static deserializeFloat(encodedFloat) {
+        return Buffer.from(encodedFloat).readFloatLE()
+    }
+
+    static deserializeByte(encodedByte) {
+        return Buffer.from(encodedByte).readUint8()
+    }
+
+    static deserializeChar(encodedChar) {
+        return Buffer.from(encodedChar).readUint8()
+    }
+
+    static deserializeLongLong(encodedLongLong) {
+        return Buffer.from(encodedLongLong).readBigInt64LE()
+    }
+
+    static deserializeDouble(encodedDouble) {
+        return Buffer.from(encodedDouble).readDoubleLE()
+    }
+
+    static deserializeULLong(encodedULLong) {
+        return Buffer.from(encodedULLong).readBigUInt64LE()
+    }
+
+    static deserializeUInt(encodedUInt) {
+        return Buffer.from(encodedUInt).readUIntLE(0, 4)
+    }
+}
+
+module.exports = TypeDeserializer