Updates

Author: 27pchrisl

src/Commands/Listen.php

@@ -12,7 +12,7 @@
 use Amp\Websocket\Server\Websocket;
 use Flat3\RevPi\Interfaces\Hardware\PiControl;
 use Flat3\RevPi\Interfaces\Hardware\Terminal;
-use Flat3\RevPi\JsonRpc\Peer;
+use Flat3\RevPi\JsonRpc\JsonRpcPeer;
 use Illuminate\Console\Command;
 use Psr\Log\LoggerInterface;
 use Revolt\EventLoop;
@@ -35,21 +35,16 @@ public function handle(LoggerInterface $logger): void
 
         $router = new Router($server, $logger, new DefaultErrorHandler);
 
-        foreach ([
-            'picontrol' => PiControl::class,
-            'terminal' => Terminal::class,
-        ] as $route => $class) {
             $router->addRoute(
                 method: 'GET',
-                uri: '/'.$route,
+                uri: '/',
                 requestHandler: new Websocket(
                     httpServer: $server,
                     logger: $logger,
                     acceptor: new Rfc6455Acceptor,
-                    clientHandler: app(Peer::class)->setDevice(app($class))
+                    clientHandler: app(JsonRpcPeer::class),
                 )
             );
-        }
 
         $server->start(
             $router,

src/Hardware/Remote/RemoteCharacterDevice.php

@@ -6,7 +6,7 @@
 
 use Flat3\RevPi\Interfaces\Hardware\Stream;
 use Flat3\RevPi\JsonRpc\Event;
-use Flat3\RevPi\JsonRpc\Peer;
+use Flat3\RevPi\JsonRpc\JsonRpcPeer;
 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(Peer $peer)
+    public function __construct(JsonRpcPeer $peer)
     {
         parent::__construct($peer);
 

src/Hardware/Remote/RemoteDevice.php

@@ -7,15 +7,15 @@
 use Amp\Websocket\WebsocketClient;
 use Flat3\RevPi\Interfaces\Hardware\Device;
 use Flat3\RevPi\Interfaces\Hardware\Ioctl;
-use Flat3\RevPi\JsonRpc\Peer;
+use Flat3\RevPi\JsonRpc\JsonRpcPeer;
 
 abstract class RemoteDevice implements Device, Ioctl
 {
-    public function __construct(protected Peer $peer) {}
+    public function __construct(protected JsonRpcPeer $peer) {}
 
     public function socket(WebsocketClient $websocket): void
     {
-        $this->peer->setSocket($websocket);
+        $this->peer->withSocket($websocket);
     }
 
     public function open(string $pathname, int $flags): int

src/Interfaces/Module.php

@@ -16,4 +16,6 @@ public function getProcessImage(): ProcessImage;
     public function resume(): void;
 
     public function monitor(Trigger $monitor): void;
+
+    public function getSerialPort(string $devicePath): SerialPort;
 }

src/Interfaces/Modules/Remote.php

@@ -6,9 +6,8 @@
 
 use Amp\Websocket\Client\WebsocketHandshake;
 use Flat3\RevPi\Interfaces\Module;
-use Psr\Http\Message\UriInterface as PsrUri;
 
 interface Remote extends Module
 {
-    public function connect(WebsocketHandshake|PsrUri|string $handshake): void;
+    public function connection(WebsocketHandshake $socket): void;
 }

src/JsonRpc/Event.php

@@ -5,7 +5,7 @@
 namespace Flat3\RevPi\JsonRpc;
 
 /**
- * @phpstan-import-type JsonRpcEventT from Peer
+ * @phpstan-import-type JsonRpcEventT from JsonRpcPeer
  */
 class Event
 {

src/JsonRpc/Peer.php renamed to src/JsonRpc/JsonRpcPeer.php

@@ -15,14 +15,14 @@
 use Flat3\RevPi\Exceptions\RemoteDeviceException;
 use Flat3\RevPi\Interfaces\Hardware\Device;
 use Flat3\RevPi\Interfaces\Hardware\Ioctl;
+use Flat3\RevPi\Interfaces\Hardware\PiControl;
 use Flat3\RevPi\Interfaces\Hardware\Seek;
 use Flat3\RevPi\Interfaces\Hardware\Stream;
 use Flat3\RevPi\Interfaces\Hardware\Terminal;
 use Flat3\RevPi\JsonRpc\Request as JsonRpcRequest;
 use Flat3\RevPi\JsonRpc\Response as JsonRpcResponse;
 use Revolt\EventLoop;
 use Throwable;
-
 use function Amp\async;
 
 /**
@@ -34,7 +34,7 @@
  * @phpstan-type JsonRpcResponseT array{id: string, error: ?array{ code: ?int, message: ?string }, result: JsonRpcResponseResultT }
  * @phpstan-type JsonRpcEventT array{type: JsonRpcEventTypeT, payload: string}
  */
-class Peer implements WebsocketClientHandler
+class JsonRpcPeer implements WebsocketClientHandler
 {
     protected WebsocketClient $socket;
 
@@ -50,15 +50,15 @@ class Peer implements WebsocketClientHandler
      */
     protected array $pending = [];
 
-    public function setSocket(WebsocketClient $socket): self
+    public function withSocket(WebsocketClient $socket): self
     {
         $this->socket = $socket;
-        async(fn () => $this->receiveLoop());
+        async(fn() => $this->handleResponse());
 
         return $this;
     }
 
-    public function setDevice(Device $device): self
+    public function withDevice(Device $device): self
     {
         $this->device = $device;
 
@@ -89,7 +89,7 @@ public function request(string $method, array $params = []): Future
         return $deferred->getFuture();
     }
 
-    private function receiveLoop(): void
+    protected function handleResponse(): void
     {
         try {
             while ($message = $this->socket->receive()) {
@@ -102,13 +102,13 @@ private function receiveLoop(): void
                     continue;
                 }
 
-                if (! $response instanceof JsonRpcResponse) {
+                if (!$response instanceof JsonRpcResponse) {
                     continue;
                 }
 
                 $id = $response->id;
 
-                if (! isset($this->pending[$id])) {
+                if (!isset($this->pending[$id])) {
                     continue;
                 }
 
@@ -263,7 +263,7 @@ public function handle(string $method, array $params): mixed
                         $request->payload = $newData;
 
                         $this->socket->sendBinary(serialize($request));
-                    } elseif (! is_resource($stream) || @feof($stream)) {
+                    } elseif (!is_resource($stream) || @feof($stream)) {
                         EventLoop::cancel($callbackId);
                     }
                 });
@@ -274,11 +274,14 @@ public function handle(string $method, array $params): mixed
         throw new NotImplementedException; // @phpstan-ignore deadCode.unreachable
     }
 
-    public function handleClient(
-        WebsocketClient $client,
-        Request $request,
-        Response $response
-    ): void {
+    public function handleClient(WebsocketClient $client, Request $request, Response $response): void
+    {
+        $this->device = match ($request->getQueryParameter('device')) {
+            'picontrol' => app(PiControl::class),
+            'terminal' => app(Terminal::class),
+            default => throw new NotImplementedException,
+        };
+
         $this->socket = $client;
 
         while ($message = $client->receive()) {

src/JsonRpc/Request.php

@@ -7,9 +7,9 @@
 use Illuminate\Support\Str;
 
 /**
- * @phpstan-import-type JsonRpcMethodT from Peer
- * @phpstan-import-type JsonRpcRequestT from Peer
- * @phpstan-import-type JsonRpcRequestParamsT from Peer
+ * @phpstan-import-type JsonRpcMethodT from JsonRpcPeer
+ * @phpstan-import-type JsonRpcRequestT from JsonRpcPeer
+ * @phpstan-import-type JsonRpcRequestParamsT from JsonRpcPeer
  */
 class Request
 {

src/JsonRpc/Response.php

@@ -5,8 +5,8 @@
 namespace Flat3\RevPi\JsonRpc;
 
 /**
- * @phpstan-import-type JsonRpcResponseT from Peer
- * @phpstan-import-type JsonRpcResponseResultT from Peer
+ * @phpstan-import-type JsonRpcResponseT from JsonRpcPeer
+ * @phpstan-import-type JsonRpcResponseResultT from JsonRpcPeer
  */
 class Response
 {

src/Modules/Connect5.php

@@ -5,6 +5,7 @@
 namespace Flat3\RevPi\Modules;
 
 use Flat3\RevPi\Interfaces\Modules\Connect5 as Connect5ModuleInterface;
+use Flat3\RevPi\Interfaces\SerialPort;
 use Flat3\RevPi\Led\Connect5Led;
 use Flat3\RevPi\Led\Led;
 use Flat3\RevPi\Led\LedPosition;