Updates

Author: 27pchrisl

src/Constants.php

@@ -6,6 +6,8 @@
 
 final class Constants
 {
+    public const BlockSize = 8192;
+
     public const f1Hz = 1;
 
     public const f20Hz = 1 / 20;

src/Hardware/HasDeviceIoctl.php

@@ -10,7 +10,7 @@
 
 trait HasDeviceIoctl
 {
-    protected function ioctl(IoctlCommand $command, ?Struct $message = null): int
+    public function ioctl(IoctlCommand $command, ?Struct $message = null): int
     {
         assert(is_int($command->value));
 

src/Hardware/Remote/RemoteCharacterDevice.php

@@ -4,6 +4,7 @@
 
 namespace Flat3\RevPi\Hardware\Remote;
 
+use Flat3\RevPi\Constants;
 use Flat3\RevPi\Interfaces\Hardware\Stream;
 use Flat3\RevPi\JsonRpc\Event;
 use Flat3\RevPi\JsonRpc\JsonRpcPeer;
@@ -39,9 +40,13 @@ public function fdopen(): mixed
         });
 
         EventLoop::onReadable($this->remote, function ($callbackId, $stream) {
-            $data = @fread($stream, 8192);
-            assert(is_string($data));
-            $this->write($data, strlen($data));
+            $data = @fread($stream, Constants::BlockSize);
+
+            if (is_string($data) && $data !== '') {
+                $this->write($data, strlen($data));
+            } elseif (! is_resource($stream) || @feof($stream)) {
+                EventLoop::cancel($callbackId);
+            }
         });
 
         return $this->local;

src/Hardware/Virtual/VirtualPiControlDevice.php

@@ -155,7 +155,7 @@ public function ioctl(int $request, ?string &$argp = null): int
         throw new IoctlFailedException; // @phpstan-ignore deadCode.unreachable
     }
 
-    protected function reset(): void
+    public function reset(): void
     {
         $this->memory = str_repeat("\0", 4096);
 

src/JsonRpc/JsonRpcPeer.php

@@ -11,6 +11,7 @@
 use Amp\Websocket\Server\WebsocketClientHandler;
 use Amp\Websocket\WebsocketClient;
 use Closure;
+use Flat3\RevPi\Constants;
 use Flat3\RevPi\Exceptions\NotImplementedException;
 use Flat3\RevPi\Exceptions\RemoteDeviceException;
 use Flat3\RevPi\Interfaces\Hardware\Device;
@@ -59,13 +60,6 @@ public function withSocket(WebsocketClient $socket): self
         return $this;
     }
 
-    public function withDevice(Device $device): self
-    {
-        $this->device = $device;
-
-        return $this;
-    }
-
     /**
      * @param  JsonRpcMethodT  $method
      * @param  JsonRpcRequestParamsT  $params
@@ -149,7 +143,7 @@ public function on(Closure $callback): void
      * @param  array<string, int|string|null>  $params
      * @return JsonRpcResponseResultT
      */
-    public function handle(string $method, array $params): mixed
+    protected function handle(string $method, array $params): mixed
     {
         switch ($method) {
             case 'open':
@@ -256,12 +250,12 @@ public function handle(string $method, array $params): mixed
                 $stream = $this->device->fdopen();
 
                 EventLoop::onReadable($stream, function ($callbackId, $stream) {
-                    $newData = @fread($stream, 8192);
+                    $data = @fread($stream, Constants::BlockSize);
 
-                    if (is_string($newData) && $newData !== '') {
+                    if (is_string($data) && $data !== '') {
                         $request = new Event;
                         $request->type = 'readable';
-                        $request->payload = $newData;
+                        $request->payload = $data;
 
                         $this->socket->sendBinary(serialize($request));
                     } elseif (! is_resource($stream) || @feof($stream)) {

src/ProcessImage/ProcessImage.php

@@ -148,7 +148,7 @@ public function dumpImage(): string
         return $buffer;
     }
 
-    protected function findVariable(string $variable): VariableStruct
+    public function findVariable(string $variable): VariableStruct
     {
         $message = new VariableStruct;
         $message->varName = $variable;