Updates

Author: 27pchrisl

README.md

@@ -110,6 +110,7 @@ This creates `app/MyPi.php`.
 
 ```php
   use Flat3\RevPi\Interfaces\Module;
+  use Flat3\RevPi\Interfaces\SerialPort;
   use Flat3\RevPi\Led\LedColour;
   use Flat3\RevPi\Led\LedPosition;
   use Flat3\RevPi\Monitors\DigitalMonitor;
@@ -124,8 +125,8 @@ This creates `app/MyPi.php`.
   $port = $pi->serialPort();
   $port->setSpeed(BaudRate::B576000);
   $port->clearFlag(LocalFlag::CanonicalInput);
-  $port->onReadable(function (string $data) use ($port) {
-      $port->write($data);
+  $port->onReadable(function (SerialPort $port) {
+      $port->write($port->read(1024));
   });
 
   // Monitor the core temperature, writing updated values to the serial port

src/Hardware/Remote/RemoteCharacterDevice.php

@@ -40,16 +40,26 @@ public function fdopen(): mixed
     {
         $this->device->request('fdopen')->await();
 
-        $this->device->on('readable', function (string $payload) {
+        $this->device->on('data', function (string $payload) {
             fwrite($this->remote, $payload);
         });
 
         EventLoop::onReadable($this->remote, function ($callbackId, $stream) {
-            $data = @fread($stream, Constants::BlockSize);
+            while (true) {
+                $data = @fread($stream, Constants::BlockSize);
+
+                if ($data === false || $data === '') {
+                    break;
+                }
 
-            if (is_string($data) && $data !== '') {
                 $this->write($data, strlen($data));
-            } elseif (! is_resource($stream) || @feof($stream)) {
+
+                if (strlen($data) < Constants::BlockSize) {
+                    break;
+                }
+            }
+
+            if (! is_resource($stream) || @feof($stream)) {
                 EventLoop::cancel($callbackId);
             }
         });

src/Interfaces/SerialPort.php

@@ -112,7 +112,7 @@ public function getStopBits(): StopBits;
     /**
      * Register a callback to be invoked when the port is readable.
      *
-     * @param  callable  $callback  Callback to invoke on readable event.
+     * @param  callable(SerialPort $port): void  $callback  Callback to invoke on readable event.
      * @return string An ID or reference for the registered callback.
      */
     public function onReadable(callable $callback): string;

src/Rpc/RpcDevice.php

@@ -139,19 +139,30 @@ protected function invoke(string $method, array $params): mixed
                 $stream = $this->device->fdopen();
 
                 EventLoop::onReadable($stream, function ($callbackId, $stream) {
-                    $data = @fread($stream, Constants::BlockSize);
+                    while (true) {
+                        $data = @fread($stream, Constants::BlockSize);
+
+                        if (!is_string($data) || $data === '') {
+                            break;
+                        }
 
-                    if (is_string($data) && $data !== '') {
                         $event = new Event;
-                        $event->type = 'readable';
+                        $event->type = 'data';
                         $event->payload = $data;
 
                         try {
                             $this->socket->sendBinary(serialize($event));
                         } catch (WebsocketClosedException) {
                             EventLoop::cancel($callbackId);
+                            break;
+                        }
+
+                        if (strlen($data) < Constants::BlockSize) {
+                            break;
                         }
-                    } elseif (! is_resource($stream) || @feof($stream)) {
+                    }
+
+                    if (!is_resource($stream) || @feof($stream)) {
                         EventLoop::cancel($callbackId);
                     }
                 });

src/Rpc/RpcHandler.php

@@ -27,10 +27,10 @@ abstract class RpcHandler
     protected WebsocketClient $socket;
 
     /**
-     * @var array{readable: array<callable>}
+     * @var array{data: array<callable>}
      */
     protected array $callbacks = [
-        'readable' => [],
+        'data' => [],
     ];
 
     /**

src/SerialPort/SerialPort.php

@@ -34,7 +34,7 @@ public function getDevice(): Terminal
     public function onReadable(callable $callback): string
     {
         return EventLoop::onReadable($this->stream, function () use ($callback) {
-            $callback(@fread($this->stream, Constants::BlockSize));
+            $callback($this);
         });
     }
 

tests/Virtual/SerialPortTest.php

@@ -21,8 +21,8 @@ public function test_read(): void
             ->setSpeed(BaudRate::B9600)
             ->setFlag(RS485Flag::TerminateBus);
 
-        $port->onReadable(function ($text) use (&$capture) {
-            $capture .= $text;
+        $port->onReadable(function (SerialPort $port) use (&$capture) {
+            $capture .= $port->read(8192);
         });
 
         $device = app(VirtualTerminalDevice::class);