Updates

Author: 27pchrisl

src/Commands/Listen.php

@@ -9,7 +9,7 @@
 use Amp\Socket\InternetAddress;
 use Amp\Websocket\Server\Rfc6455Acceptor;
 use Amp\Websocket\Server\Websocket;
-use Flat3\RevPi\JsonRpc\ClientHandler;
+use Flat3\RevPi\Rpc\ClientHandler;
 use Illuminate\Console\Command;
 use Psr\Log\LoggerInterface;
 use Revolt\EventLoop;

src/Hardware/Remote/RemoteCharacterDevice.php

@@ -6,7 +6,7 @@
 
 use Flat3\RevPi\Constants;
 use Flat3\RevPi\Interfaces\Hardware\Stream;
-use Flat3\RevPi\JsonRpc\JsonRpcDevice;
+use Flat3\RevPi\Rpc\RpcDevice;
 use Revolt\EventLoop;
 
 abstract class RemoteCharacterDevice extends RemoteDevice implements Stream
@@ -17,7 +17,7 @@ abstract class RemoteCharacterDevice extends RemoteDevice implements Stream
     /** @var resource */
     protected mixed $remote;
 
-    public function __construct(JsonRpcDevice $peer)
+    public function __construct(RpcDevice $peer)
     {
         parent::__construct($peer);
 
@@ -28,6 +28,14 @@ public function __construct(JsonRpcDevice $peer)
         stream_set_blocking($this->remote, false);
     }
 
+    public function close(): int
+    {
+        fclose($this->remote);
+        fclose($this->local);
+
+        return parent::close();
+    }
+
     public function fdopen(): mixed
     {
         $this->device->request('fdopen')->await();

src/Hardware/Remote/RemoteDevice.php

@@ -7,13 +7,13 @@
 use Amp\Websocket\WebsocketClient;
 use Flat3\RevPi\Interfaces\Hardware\Device;
 use Flat3\RevPi\Interfaces\Hardware\Ioctl;
-use Flat3\RevPi\JsonRpc\JsonRpcDevice;
+use Flat3\RevPi\Rpc\RpcDevice;
 
 use function Amp\async;
 
 abstract class RemoteDevice implements Device, Ioctl
 {
-    public function __construct(protected JsonRpcDevice $device) {}
+    public function __construct(protected RpcDevice $device) {}
 
     public function socket(WebsocketClient $websocket): void
     {

src/Interfaces/Module.php

@@ -46,8 +46,8 @@ public function monitor(string $variable, Monitor $monitor, callable $callback):
     /**
      * Get a serial port instance for communication on the specified device path.
      *
-     * @param  string  $devicePath  The path to the serial device (e.g. "/dev/ttyS0").
+     * @param  string  $devicePath  The path to the serial device (e.g. "/dev/ttyRS485").
      * @return SerialPort The serial port instance.
      */
-    public function getSerialPort(string $devicePath): SerialPort;
+    public function getSerialPort(string $devicePath = '/dev/ttyRS485'): SerialPort;
 }

src/Interfaces/SerialPort.php

@@ -137,7 +137,7 @@ public function write(string $data): void;
      *
      * @param  QueueSelector  $selector  Selector specifying which buffers to flush.
      */
-    public function flush(QueueSelector $selector): void;
+    public function flush(QueueSelector $selector = QueueSelector::Both): void;
 
     /**
      * Wait until all output written to the serial port has been transmitted.

src/Modules/Module.php

@@ -32,7 +32,7 @@ public function getProcessImage(): ProcessImage
         return $this->processImage;
     }
 
-    public function getSerialPort(string $devicePath): SerialPort
+    public function getSerialPort(string $devicePath = '/dev/ttyRS485'): SerialPort
     {
         return app(SerialPort::class, ['devicePath' => $devicePath]);
     }

src/Modules/Remote.php

@@ -40,7 +40,7 @@ public function getProcessImage(): ProcessImage
         return $this->processImage;
     }
 
-    public function getSerialPort(string $devicePath): SerialPort
+    public function getSerialPort(string $devicePath = '/dev/ttyRS485'): SerialPort
     {
         $terminal = app(RemoteTerminalDevice::class);
         $terminal->socket(connect($this->handshake->withQueryParameter('device', 'terminal')));

src/Modules/Virtual.php

@@ -18,7 +18,7 @@ public function getLed(LedPosition $position): Led
         return app(VirtualLed::class, ['position' => $position]);
     }
 
-    public function getSerialPort(string $devicePath): SerialPort
+    public function getSerialPort(string $devicePath = '/dev/ttyRS485'): SerialPort
     {
         return app(SerialPort::class, ['device' => app(VirtualTerminalDevice::class)]);
     }

src/RevolutionPi.php

@@ -64,7 +64,7 @@ public function led(LedPosition $position): Led
     /**
      * Get the SerialPort object for communication via a specific device path.
      */
-    public function serialPort(string $devicePath = '/dev/ttyRS485-0'): SerialPort
+    public function serialPort(string $devicePath = '/dev/ttyRS485'): SerialPort
     {
         return $this->module()->getSerialPort($devicePath);
     }

src/JsonRpc/ClientHandler.php renamed to src/Rpc/ClientHandler.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Flat3\RevPi\JsonRpc;
+namespace Flat3\RevPi\Rpc;
 
 use Amp\Http\Server\Request;
 use Amp\Http\Server\Response;
@@ -22,7 +22,7 @@ public function handleClient(WebsocketClient $client, Request $request, Response
             default => throw new NotSupportedException,
         };
 
-        $handler = app(JsonRpcDevice::class);
+        $handler = app(RpcDevice::class);
         $handler->setDevice($target);
 
         $handler->attachSocket($client);