javonet-ruby-sdk 2.6.11 → 2.6.12

data/lib/javonet-ruby-sdk/Binaries/Perl/Windows/X64/lib/Javonet/Core/Protocol/CommandSerializer.pm

@@ -8,81 +8,92 @@ use aliased 'Javonet::Sdk::Core::RuntimeLib' => 'RuntimeLib', qw(get_runtime);
 use aliased 'Javonet::Sdk::Core::Type' => 'Type', qw(get_type);
 use aliased 'Javonet::Core::Protocol::TypeSerializer' => 'TypeSerializer';
 use aliased 'Javonet::Sdk::Core::TypesHandler' => 'TypesHandler';
+use aliased 'Javonet::Core::Handler::ReferencesCache' => 'ReferencesCache';
+use aliased 'Javonet::Sdk::Core::PerlCommandType' => 'PerlCommandType';
 use Javonet::Sdk::Internal::ConnectionType;
-use Thread::Queue;
 
 use Exporter qw(import);
-our @EXPORT = qw(serialize serialize_tcp_address serialize_recursively insert_into_buffer);
-
-my @byte_buffer = ();
-my $queue = Thread::Queue->new();
+our @EXPORT = qw(serialize serialize_connection_data);
 
 sub serialize {
     my ($class, $root_command, $connection_type, $tcp_address, $runtimeVersion) = @_;
-    @byte_buffer = ();
-    $queue = Thread::Queue->new();
-    $queue->insert(0, $root_command);
-    $class->insert_into_buffer(($root_command->{runtime}, $runtimeVersion));
-    $class->insert_into_buffer($class->serialize_tcp_address($connection_type, $tcp_address));
-    $class->insert_into_buffer(Javonet::Sdk::Core::RuntimeLib::get_runtime('Perl'), $root_command->{command_type});
-    $class->serialize_recursively();
+    $runtimeVersion = 0 unless defined $runtimeVersion;
+    
+    # Local buffer instead of global
+    my @byte_buffer = ();
+    
+    # Helper to insert data into buffer
+    my $insert_into_buffer = sub {
+        my (@data) = @_;
+        push @byte_buffer, @data;
+    };
+    
+    # Write runtime and version
+    $insert_into_buffer->($root_command->{runtime}, $runtimeVersion);
+    
+    # Write connection data
+    my @connection_data = $class->serialize_connection_data($connection_type, $tcp_address);
+    $insert_into_buffer->(@connection_data);
+    
+    # Write runtime name and command type header for Perl runtime
+    $insert_into_buffer->(
+        Javonet::Sdk::Core::RuntimeLib::get_runtime('Perl'),
+        $root_command->{command_type}
+    );
+    
+    # Serialize payload recursively
+    $class->serialize_recursively($root_command, $insert_into_buffer);
+    
     return @byte_buffer;
 }
 
-sub serialize_tcp_address {
+sub serialize_connection_data {
     my ($class, $connection_type, $tcp_address) = @_;
-    my @tcp_byte_array;
-    if (Javonet::Sdk::Internal::ConnectionType::get_connection_type('Tcp') eq $connection_type) {
+    if (defined $connection_type && 
+        Javonet::Sdk::Internal::ConnectionType::get_connection_type('Tcp') eq $connection_type) {
         my @tcp_array = split(':', $tcp_address);
         my @tcp_ip = split('\\.', $tcp_array[0]);
         my @bytes_port = unpack "C*", pack "v", $tcp_array[1];
-        @tcp_byte_array = (Javonet::Sdk::Internal::ConnectionType::get_connection_type('Tcp'), @tcp_ip, @bytes_port);
-        return @tcp_byte_array;
+        return (Javonet::Sdk::Internal::ConnectionType::get_connection_type('Tcp'), @tcp_ip, @bytes_port);
     }
     else {
-        @tcp_byte_array = (Javonet::Sdk::Internal::ConnectionType::get_connection_type('InMemory'), 0, 0, 0, 0, 0, 0);
-        return @tcp_byte_array;
+        return (Javonet::Sdk::Internal::ConnectionType::get_connection_type('InMemory'), 0, 0, 0, 0, 0, 0);
     }
 }
 
+# Recursively serialize command payload - matches C# SerializeRecursively
 sub serialize_recursively {
-    my ($class) = @_;
-    my $left = $queue->pending();
-    if ($left == 0) {
-        return @byte_buffer;
-    }
-    my $command = $queue->dequeue();
-    $queue->insert(0, $command->drop_first_payload_argument());
-    my $current_payload_ref = $command->{payload};
-    my @cur_payload = @$current_payload_ref;
-    my $payload_len = @cur_payload;
-    if ($payload_len > 0) {
-        if (!defined $cur_payload[0]) {
-            $class->insert_into_buffer(TypeSerializer->serializePrimitive(undef));
+    my ($class, $command, $insert_into_buffer) = @_;
+    
+    my $payload_ref = $command->{payload};
+    my @payload = @$payload_ref;
+    
+    foreach my $item (@payload) {
+        if (defined $item && ref $item eq 'Javonet::Sdk::Core::PerlCommand') {
+            # Item is a Command - serialize it and recurse
+            my @command_bytes = TypeSerializer->serializeCommand($item);
+            $insert_into_buffer->(@command_bytes);
+            $class->serialize_recursively($item, $insert_into_buffer);
         }
-        elsif ($cur_payload[0]->isa("Javonet::Sdk::Core::PerlCommand")) {
-            my $inner_command = $cur_payload[0];
-            $class->insert_into_buffer(TypeSerializer->serializeCommand($inner_command));
-            $queue->insert(0, $inner_command);
-        }
-        elsif (TypesHandler->is_primitive_or_none($cur_payload[0])) {
-            my @result = TypeSerializer->serializePrimitive($cur_payload[0]);
-            $class->insert_into_buffer(@result);
+        elsif (TypesHandler->is_primitive_or_none($item)) {
+            # Item is primitive or null
+            my @primitive_bytes = TypeSerializer->serializePrimitive($item);
+            $insert_into_buffer->(@primitive_bytes);
         }
         else {
-            die "Unsupported payload item type: " . ref($cur_payload[0]) . " for payload item: $cur_payload[0].";
+            # Item is a reference - cache it and create a Reference command
+            my $reference_cache = ReferencesCache->new();
+            my $guid = $reference_cache->cache_reference($item);
+            my $reference_command = PerlCommand->new(
+                runtime => Javonet::Sdk::Core::RuntimeLib::get_runtime('Perl'),
+                command_type => PerlCommandType->get_command_type('Reference'),
+                payload => [$guid]
+            );
+            my @command_bytes = TypeSerializer->serializeCommand($reference_command);
+            $insert_into_buffer->(@command_bytes);
+            $class->serialize_recursively($reference_command, $insert_into_buffer);
         }
-        return $class->serialize_recursively();
     }
-    else {
-        $queue->dequeue();
-    }
-    return $class->serialize_recursively();
-}
-
-sub insert_into_buffer {
-    my ($class, @arguments) = @_;
-    @byte_buffer = (@byte_buffer, @arguments);
 }
 
 1;

data/lib/javonet-ruby-sdk/Binaries/Php/javonet/core/webSocketClient/WebSocketClient.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace core\webSocketClient;
 
 use RuntimeException;
+use Throwable;
 use utils\Uri as URI;
 
 final class WebSocketClient
@@ -13,10 +14,9 @@ final class WebSocketClient
     private const UNSECURE_PORT_NUMBER = 80;
 
     /** @var resource|null */
-    private $socket = null;
+    private $socket;
 
     private URI $uri;
-    private bool $connected = false;
     private string $secKey;
 
     /** ---------- Static cache & helpers (mirror Ruby) ---------- */
@@ -73,7 +73,8 @@ final class WebSocketClient
                 throw new RuntimeException('No response');
             }
             return $resp;
-        } catch (\Throwable $e) {
+
+        } catch (Throwable $e) {
             self::closeClient($uri, true); // suppress close frame
             $client = self::addOrGetClient($uri);
             $client->sendByteArray($message);
@@ -98,7 +99,10 @@ final class WebSocketClient
     public static function getState(URI $uri): ?string
     {
         $key = self::uriKey($uri);
-        if (!isset(self::$cache[$key])) return null;
+        if (!isset(self::$cache[$key])) {
+            return null;
+        }
+
         return self::$cache[$key]->open() ? 'OPEN' : 'CLOSED';
     }
 
@@ -111,7 +115,6 @@ final class WebSocketClient
 
         $this->socket = $this->openSocket();
         $this->performHandshake();
-        $this->connected = true;
     }
 
     public function __destruct()
@@ -121,8 +124,11 @@ final class WebSocketClient
 
     public function open(): bool
     {
-        if (!is_resource($this->socket)) return false;
+        if (!is_resource($this->socket)) {
+            return false;
+        }
         $meta = @stream_get_meta_data($this->socket);
+
         return is_array($meta) && !$meta['eof'];
     }
 
@@ -137,7 +143,6 @@ final class WebSocketClient
                 @fwrite($this->socket, "\x88\x00");
                 @fflush($this->socket);
             }
-            $this->connected = false;
             @stream_socket_shutdown($this->socket, STREAM_SHUT_RDWR);
             @fclose($this->socket);
         }
@@ -146,7 +151,8 @@ final class WebSocketClient
 
     /** ---------- Core I/O ---------- */
 
-    /** Send a binary message from an array of bytes (0..255) */
+    /** Send a binary message from an array of bytes (0..255)
+     */
     private function sendByteArray(array $message): void
     {
         if (!$this->open()) {
@@ -169,14 +175,17 @@ final class WebSocketClient
      * Receive a single complete message as array<int>. Returns null on timeout/close.
      * Handles fragmentation and control frames (ping/pong/close).
      */
-    private function receiveByteArray(int $timeoutSec = 5): ?array
+    private function receiveByteArray(): ?array
     {
+        $timeoutSec = 5;
         $deadline = microtime(true) + $timeoutSec;
         $messagePayload = '';
 
         while (true) {
             $remaining = $deadline - microtime(true);
-            if ($remaining <= 0) return null;
+            if ($remaining <= 0)  {
+                return null;
+            }
 
             $read = [$this->socket];
             $write = $except = [];
@@ -236,11 +245,11 @@ final class WebSocketClient
         $hostHeader = $this->hostWithPort();
 
         $request =
-            "GET {$path} HTTP/1.1\r\n" .
-            "Host: {$hostHeader}\r\n" .
+            "GET $path HTTP/1.1\r\n" .
+            "Host: $hostHeader\r\n" .
             "Upgrade: websocket\r\n" .
             "Connection: Upgrade\r\n" .
-            "Sec-WebSocket-Key: {$this->secKey}\r\n" .
+            "Sec-WebSocket-Key: $this->secKey\r\n" .
             "Sec-WebSocket-Version: 13\r\n\r\n";
 
         $this->writeAll($request);
@@ -265,7 +274,8 @@ final class WebSocketClient
         }
     }
 
-    /** Build a masked client binary frame (handles any length) */
+    /** Build a masked client binary frame (handles any length)
+     */
     private function buildClientBinaryFrame(string $payload): string
     {
         $finOpcode = chr(0x80 | 0x2); // FIN + binary
@@ -282,8 +292,8 @@ final class WebSocketClient
             $header .= chr($maskBit | 126) . pack('n', $len);
         } else {
             // 64-bit network byte order using two 32-bit words
-            $hi = (int) (($len & 0xFFFFFFFF00000000) >> 32);
-            $lo = (int) ($len & 0x00000000FFFFFFFF);
+            $hi = ($len & 0xFFFFFFFF00000000) >> 32;
+            $lo = $len & 0x00000000FFFFFFFF;
             $header .= chr($maskBit | 127) . pack('N2', $hi, $lo);
         }
 
@@ -301,7 +311,9 @@ final class WebSocketClient
     private function readFrame(): ?array
     {
         $h = $this->readExact(2);
-        if ($h === null) return null;
+        if ($h === null) {
+            return null;
+        }
 
         $arr = unpack('C2', $h);
         $b1 = $arr[1];
@@ -314,11 +326,15 @@ final class WebSocketClient
 
         if ($len === 126) {
             $ext = $this->readExact(2);
-            if ($ext === null) return null;
+            if ($ext === null) {
+                return null;
+            }
             $len = current(unpack('n', $ext));
         } elseif ($len === 127) {
             $ext = $this->readExact(8);
-            if ($ext === null) return null;
+            if ($ext === null) {
+                return null;
+            }
             $parts = unpack('N2', $ext);
             $hi = $parts[1];
             $lo = $parts[2];
@@ -329,11 +345,15 @@ final class WebSocketClient
         if ($masked) {
             // Servers should not mask; handle defensively
             $maskKey = $this->readExact(4);
-            if ($maskKey === null) return null;
+            if ($maskKey === null) {
+                return null;
+            }
         }
 
         $payload = ($len > 0) ? ($this->readExact($len) ?? '') : '';
-        if ($payload === '' && $len > 0) return null;
+        if ($payload === '' && $len > 0) {
+            return null;
+        }
 
         if ($masked) {
             $repeat = (int)ceil($len / 4);
@@ -347,6 +367,9 @@ final class WebSocketClient
     /** ---------- Low-level utilities ---------- */
 
     /** Open TCP/SSL socket; port taken from URI or defaulted by scheme like Ruby */
+    /**
+     * @return resource
+     */
     private function openSocket()
     {
         $host   = $this->uri->getHost();
@@ -385,11 +408,12 @@ final class WebSocketClient
         );
 
         if ($socket === false) {
-            throw new \RuntimeException(sprintf('Could not connect to %s:%d - %s (%d)', $host, $port, $errStr, $errNo));
+            throw new RuntimeException(sprintf('Could not connect to %s:%d - %s (%d)', $host, $port, $errStr, $errNo));
         }
 
         stream_set_blocking($socket, true);
         stream_set_timeout($socket, 5);
+
         return $socket;
     }
 
@@ -399,18 +423,26 @@ final class WebSocketClient
         $buf = '';
         while (strlen($buf) < $maxBytes) {
             $remaining = $deadline - microtime(true);
-            if ($remaining <= 0) return null;
+            if ($remaining <= 0) {
+                return null;
+            }
 
             $read = [$this->socket];
             $write = $except = [];
             $sec = (int)$remaining;
             $usec = (int)(($remaining - $sec) * 1_000_000);
             $n = @stream_select($read, $write, $except, $sec, $usec);
-            if ($n === false) return null;
-            if ($n === 0) continue;
+            if ($n === false) {
+                return null;
+            }
+            if ($n === 0) {
+                continue;
+            }
 
             $chunk = @fread($this->socket, 1024);
-            if ($chunk === '' || $chunk === false) break;
+            if ($chunk === '' || $chunk === false) {
+                break;
+            }
             $buf .= $chunk;
 
             if (strpos($buf, "\r\n\r\n") !== false) {
@@ -439,15 +471,23 @@ final class WebSocketClient
         $buf = '';
         while (strlen($buf) < $len) {
             $chunk = @fread($this->socket, $len - strlen($buf));
-            if ($chunk === false) return null;
+            if ($chunk === false) {
+                return null;
+            }
             if ($chunk === '') {
                 $meta = @stream_get_meta_data($this->socket);
-                if (!$meta || $meta['eof']) return null;
+                if (!$meta || $meta['eof']) {
+                    return null;
+                }
                 // brief wait
                 $r = [$this->socket]; $w = $e = [];
                 $n = @stream_select($r, $w, $e, 1, 0);
-                if ($n === 0) continue;
-                if ($n === false) return null;
+                if ($n === 0) {
+                    continue;
+                }
+                if ($n === false) {
+                    return null;
+                }
                 continue;
             }
             $buf .= $chunk;
@@ -465,12 +505,12 @@ final class WebSocketClient
             } elseif ($len <= 0xFFFF) {
                 $hdr .= chr(0x00 | 126) . pack('n', $len);
             } else {
-                $hi = (int) (($len & 0xFFFFFFFF00000000) >> 32);
-                $lo = (int) ($len & 0x00000000FFFFFFFF);
+                $hi = ($len & 0xFFFFFFFF00000000) >> 32;
+                $lo = $len & 0x00000000FFFFFFFF;
                 $hdr .= chr(0x00 | 127) . pack('N2', $hi, $lo);
             }
             $this->writeAll($hdr . $payload);
-        } catch (\Throwable $e) {
+        } catch (Throwable $e) {
             // ignore
         }
     }
@@ -479,7 +519,7 @@ final class WebSocketClient
     {
         try {
             $this->writeAll("\x88\x00");
-        } catch (\Throwable $e) {
+        } catch (Throwable $e) {
             // ignore
         }
     }
@@ -494,7 +534,9 @@ final class WebSocketClient
     private function resolvePort(): int
     {
         $p = $this->uri->getPort();
-        if ($p !== null) return $p;
+        if ($p !== null) {
+            return $p;
+        }
         return $this->isSecure() ? self::SECURE_PORT_NUMBER : self::UNSECURE_PORT_NUMBER;
     }
 

data/lib/javonet-ruby-sdk/Binaries/Python2/javonet/core/handler/ArrayGetItemHandler.py

@@ -4,8 +4,6 @@ The ArrayGetItemHandler class handles retrieving array elements.
 """
 
 from javonet.core.handler.AbstractCommandHandler import AbstractCommandHandler
-from javonet.utils.Command import Command
-from javonet.utils.CommandType import CommandType
 import sys
 import traceback
 
@@ -21,7 +19,6 @@ class ArrayGetItemHandler(AbstractCommandHandler):
         """
         self._required_parameters_count = 2
 
-
     def process(self, command):
         """
         Process the command.
@@ -35,11 +32,11 @@ class ArrayGetItemHandler(AbstractCommandHandler):
 
             array = command.payload[0]
             if isinstance(command.payload[1], list):
-                indexes = command.payload[1]
+                indexes = [self.__extract_value(item) for item in command.payload[1]]
             else:
-                indexes = command.payload[1:]
+                indexes = [self.__extract_value(item) for item in command.payload[1:]]
 
-            array_copy = array[:]  # W Pythonie 2 używamy slicingu zamiast copy()
+            array_copy = array[:]  # In Python 2 we use slicing instead of copy()
             for i in indexes:
                 array_copy = array_copy[i]
             return array_copy

data/lib/javonet-ruby-sdk/Binaries/Python2/javonet/core/handler/ArraySetItemHandler.py

@@ -4,6 +4,9 @@ The ArraySetItemHandler class handles setting array elements.
 """
 
 from javonet.core.handler.AbstractCommandHandler import AbstractCommandHandler
+from javonet.core.handler.HandlerDictionary import handler_dict
+from javonet.utils.Command import Command
+from javonet.utils.CommandType import CommandType
 import sys
 import traceback
 
@@ -19,6 +22,24 @@ class ArraySetItemHandler(AbstractCommandHandler):
         """
         self._required_parameters_count = 3
 
+    @staticmethod
+    def __extract_value(item):
+        """
+        Extract the actual value from an item, handling Command objects.
+        
+        :param item: Item that may be a Command or a value
+        :return: The actual value
+        """
+        if isinstance(item, Command):
+            if item.command_type == CommandType.Value:
+                return item.payload[0] if len(item.payload) > 0 else None
+            else:
+                handler = handler_dict.get(item.command_type)
+                if handler is not None:
+                    return handler.handle_command(item)
+                return item
+        return item
+
     def process(self, command):
         """
         Handles the array element setting command.
@@ -32,11 +53,11 @@ class ArraySetItemHandler(AbstractCommandHandler):
 
             array = command.payload[0]
 
-            value = command.payload[2]
+            value = self.__extract_value(command.payload[2])
             if isinstance(command.payload[1], list):
-                indexes = command.payload[1]
+                indexes = [self.__extract_value(item) for item in command.payload[1]]
             else:
-                indexes = [command.payload[1]]
+                indexes = [self.__extract_value(command.payload[1])]
 
             if isinstance(command.payload[0], dict):
                 array[indexes[0]] = value