javonet-ruby-sdk 2.6.10 → 2.6.12

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/Php/javonet/utils/Command.php

@@ -14,18 +14,26 @@ final class Command implements CommandInterface
     /** @var array<mixed> */
     private array $payload;
 
+    /**
+     * Constructor with variadic parameters (params object[] payload in C#)
+     * Also handles Array payload case - if a single array is passed, treat it as the payload
+     */
     public function __construct(
         RuntimeName $runtimeName,
         CommandType $commandType,
-                    ...$payload
+        ...$payload
     ) {
         $this->runtimeName = $runtimeName;
         $this->commandType = $commandType;
-
-        // If a single array is passed, treat it as the payload itself.
-        if (count($payload) === 1 && is_array($payload[0])) {
+        
+        if ($payload === null || count($payload) === 0) {
+            $this->payload = [];
+        } elseif (count($payload) === 1 && is_array($payload[0])) {
+            // Single array passed - treat it as the payload itself (Array payload case in C#)
+            // Reuse array directly - no conversion overhead if it's already object[]
             $this->payload = $payload[0];
         } else {
+            // Multiple arguments or non-array - treat as variadic params
             $this->payload = $payload;
         }
     }
@@ -35,10 +43,19 @@ final class Command implements CommandInterface
      */
     public function addArgToPayload($arg): CommandInterface
     {
-        // Keep semantics (return new Command) but avoid array_merge overhead.
-        $newPayload = $this->payload;
-        $newPayload[] = $arg;
-
+        $oldLength = count($this->payload);
+        $newPayload = [];
+        
+        if ($oldLength > 0) {
+            // Copy existing payload
+            foreach ($this->payload as $item) {
+                $newPayload[] = $item;
+            }
+        }
+        
+        $newPayload[$oldLength] = $arg;
+        
+        // Pass as single array argument to match Array constructor pattern
         return new Command($this->runtimeName, $this->commandType, $newPayload);
     }
 
@@ -91,16 +108,29 @@ final class Command implements CommandInterface
     public function __toString(): string
     {
         try {
-            $result = 'RuntimeName: ';
+            $result = 'RuntimeName ';
             $result .= $this->runtimeName->getName();
-            $result .= ' CommandType: ';
+            $result .= ' ';
+            $result .= 'CommandType ';
             $result .= $this->commandType->getName();
-            $result .= ' Payload: ';
-            $result .= json_encode($this->payload);
-
+            $result .= ' ';
+            $result .= 'Payload ';
+            
+            $payload = $this->payload;
+            $len = count($payload);
+            
+            for ($i = 0; $i < $len; $i++) {
+                $item = $payload[$i];
+                $result .= ($item !== null ? (string)$item : 'null');
+                
+                if ($i < $len - 1) {
+                    $result .= ' ';
+                }
+            }
+            
             return $result;
         } catch (Exception $e) {
-            return 'Error while converting command to string: ' . $e->getMessage();
+            return 'Error while converting command to string:' . $e->getMessage();
         }
     }
 
@@ -128,11 +158,43 @@ final class Command implements CommandInterface
             return new self($this->runtimeName, $this->commandType, $this->payload);
         }
 
-        return new self(
-            $this->runtimeName,
-            $this->commandType,
-            [$currentCommand, ...$this->payload]
-        );
+        $oldLength = count($this->payload);
+        $newPayload = [];
+        
+        // Put new element at the front
+        $newPayload[0] = $currentCommand;
+        
+        if ($oldLength > 0) {
+            // Copy existing payload starting from index 1
+            foreach ($this->payload as $item) {
+                $newPayload[] = $item;
+            }
+        }
+        
+        // Pass as single array argument to match Array constructor pattern
+        return new self($this->runtimeName, $this->commandType, $newPayload);
+    }
+
+    /**
+     * Drop first payload argument and return new Command
+     */
+    public function dropFirstPayloadArg(): CommandInterface
+    {
+        $payloadLength = count($this->payload);
+        
+        if ($payloadLength <= 1) {
+            return new Command($this->runtimeName, $this->commandType);
+        }
+        
+        $newPayload = [];
+        
+        // Copy from index 1 to end
+        for ($i = 1; $i < $payloadLength; $i++) {
+            $newPayload[] = $this->payload[$i];
+        }
+        
+        // Pass as single array argument to match Array constructor pattern
+        return new Command($this->runtimeName, $this->commandType, $newPayload);
     }
 
     /**
@@ -148,16 +210,18 @@ final class Command implements CommandInterface
             return false;
         }
 
-        if ($this->runtimeName !== $element->runtimeName || $this->commandType !== $element->commandType) {
+        if ($this->runtimeName->getValue() !== $element->getRuntimeName()->getValue() || 
+            $this->commandType->getValue() !== $element->getCommandType()->getValue()) {
             return false;
         }
 
-        if (count($this->payload) !== count($element->payload)) {
+        $elementPayload = $element->getPayload();
+        if (count($this->payload) !== count($elementPayload)) {
             return false;
         }
 
         foreach ($this->payload as $index => $payloadItem) {
-            $elementPayloadItem = $element->payload[$index];
+            $elementPayloadItem = $elementPayload[$index];
 
             if ($payloadItem instanceof CommandInterface && $elementPayloadItem instanceof CommandInterface) {
                 if (!$payloadItem->equals($elementPayloadItem)) {

data/lib/javonet-ruby-sdk/Binaries/Php/javonet/utils/DynamicMethodFactory.php

@@ -45,8 +45,7 @@ final class DynamicMethodFactory
                     $payload
                 );
 
-                $interpreter = new Interpreter();
-                $executeCall = $interpreter->execute(
+                $executeCall = Interpreter::execute(
                     $invokeDelegateCommand, 
                     new InMemoryConnectionData()
                 );

data/lib/javonet-ruby-sdk/Binaries/Php/javonet/utils/ExceptionSerializer.php

@@ -27,7 +27,21 @@ final class ExceptionSerializer
         $exceptionName = basename(str_replace('\\', '/', get_class($exception)));
 
         $exceptionCommand = $exceptionCommand->addArgToPayload(ExceptionType::getExceptionCodeByExceptionName($exceptionName));
-        $exceptionCommand = $exceptionCommand->addArgToPayload((string)$command);
+        $commandString = '';
+        try {
+            if (is_string($command)) {
+                $commandString = $command;
+            } elseif (method_exists($command, '__toString')) {
+                $commandString = (string)$command;
+            } else {
+                $encoded = json_encode($command, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+                $commandString = $encoded !== false ? $encoded : get_class($command);
+            }
+        } catch (\Throwable $e) {
+            $commandString = get_class($command);
+        }
+
+        $exceptionCommand = $exceptionCommand->addArgToPayload($commandString);
         $exceptionCommand = $exceptionCommand->addArgToPayload($exceptionName);
         $exceptionCommand = $exceptionCommand->addArgToPayload($exception->getMessage());
         $exceptionCommand = $exceptionCommand->addArgToPayload($stackClasses);

data/lib/javonet-ruby-sdk/Binaries/Php/javonet/utils/RuntimeNameHandler.php

@@ -37,4 +37,36 @@ final class RuntimeNameHandler
                  throw new \Exception('Invalid runtime name.');
         }
     }
+
+    public static function getRuntimeName(string $runtime): RuntimeName
+    {
+        switch (strtolower($runtime)) {
+            case 'clr':
+                return new RuntimeName(RuntimeName::CLR);
+            case 'go':
+                return new RuntimeName(RuntimeName::GO);
+            case 'jvm':
+                return new RuntimeName(RuntimeName::JVM);
+            case 'netcore':
+                return new RuntimeName(RuntimeName::NETCORE);
+            case 'perl':
+                return new RuntimeName(RuntimeName::PERL);
+            case 'python':
+                return new RuntimeName(RuntimeName::PYTHON);
+            case 'ruby':
+                return new RuntimeName(RuntimeName::RUBY);
+            case 'nodejs':
+                return new RuntimeName(RuntimeName::NODEJS);
+            case 'cpp':
+                return new RuntimeName(RuntimeName::CPP);
+            case 'php':
+                return new RuntimeName(RuntimeName::PHP);
+            case 'python27':
+                return new RuntimeName(RuntimeName::PYTHON27);
+            case 'none':
+                return new RuntimeName(RuntimeName::NONE);
+            default:
+                 throw new \Exception('Invalid runtime name string.');
+        }
+    }
 }

data/lib/javonet-ruby-sdk/Binaries/Php/javonet/utils/UtilsConst.php

@@ -28,9 +28,12 @@ final class UtilsConst
 
     public static function getJavonetWorkingDirectory(): string
     {
-         if (empty(self::$javonetWorkingDirectory)) {
-             return self::$javonetWorkingDirectory = dirname(__DIR__) . '/';
-         }
+        if (empty(self::$javonetWorkingDirectory)) {
+            $base = str_replace('\\', '/', dirname(__DIR__));
+            self::$javonetWorkingDirectory = rtrim($base, '/') . '/';
+        } else {
+            self::$javonetWorkingDirectory = rtrim(str_replace('\\', '/', self::$javonetWorkingDirectory), '/') . '/';
+        }
 
         return self::$javonetWorkingDirectory;
     }

data/lib/javonet-ruby-sdk/Binaries/Php/javonet/utils/connectiondata/IConnectionData.php

@@ -12,4 +12,4 @@ interface IConnectionData
     public function getHostname(): string;
     public function serializeConnectionData(): array;
     public function toString(): string;
-}
+}

data/lib/javonet-ruby-sdk/Binaries/Php/javonet/utils/connectiondata/InMemoryConnectionData.php

@@ -32,4 +32,4 @@ final class InMemoryConnectionData implements IConnectionData
     {
         return $this->getHostname();
     }
-}
+}

data/lib/javonet-ruby-sdk/Binaries/Php/javonet/utils/connectiondata/TcpConnectionData.php

@@ -60,6 +60,11 @@ final class TcpConnectionData implements IConnectionData
         ];
     }
 
+    public function getPort(): int
+    {
+        return $this->port;
+    }
+
     public function toString(): string
     {
         return $this->ipAddress . ':' . $this->port;
@@ -69,4 +74,4 @@ final class TcpConnectionData implements IConnectionData
     {
         return $this->ipAddress . ':' . $this->port;
     }
-}
+}

data/lib/javonet-ruby-sdk/Binaries/Php/javonet/utils/connectiondata/WsConnectionData.php

@@ -40,4 +40,4 @@ final class WsConnectionData implements IConnectionData
     {
         return $this->hostName;
     }
-}
+}

data/lib/javonet-ruby-sdk/Binaries/Python/javonet/core/callback/callbackFunc.py

@@ -3,10 +3,10 @@ from ctypes import *
 def callbackFunc(message_byte_array, message_byte_array_len):
     message_byte_array_py = bytearray((c_ubyte * message_byte_array_len).from_address(
         addressof(message_byte_array.contents)))
-    message_byte_array_len_py = int(message_byte_array_len)
     from javonet.core.receiver.Receiver import Receiver
-    python_receiver = Receiver()
+    # Initialize exception handler if not already done
+    Receiver.initialize_exception_handler()
     if message_byte_array[10] == 11:
-        return python_receiver.HeartBeat(message_byte_array_py, message_byte_array_len_py)
+        return Receiver.heart_beat(message_byte_array_py)
     else:
-        return python_receiver.SendCommand(message_byte_array_py, message_byte_array_len_py)
+        return Receiver.send_command(message_byte_array_py)