Updates

Author: 27pchrisl

src/Hardware/Remote/RemoteCharacterDevice.php

@@ -6,7 +6,6 @@
 
 use Flat3\RevPi\Constants;
 use Flat3\RevPi\Interfaces\Hardware\Stream;
-use Flat3\RevPi\JsonRpc\Event;
 use Flat3\RevPi\JsonRpc\JsonRpcDevice;
 use Revolt\EventLoop;
 
@@ -33,10 +32,8 @@ public function fdopen(): mixed
     {
         $this->peer->request('fdopen')->await();
 
-        $this->peer->on(function (Event $event) {
-            if ($event->type === 'readable') {
-                fwrite($this->remote, $event->payload);
-            }
+        $this->peer->on('readable', function (string $payload) {
+            fwrite($this->remote, $payload);
         });
 
         EventLoop::onReadable($this->remote, function ($callbackId, $stream) {

src/JsonRpc/Event.php

@@ -6,9 +6,13 @@
 
 /**
  * @phpstan-import-type JsonRpcEventT from JsonRpcPeer
+ * @phpstan-import-type JsonRpcEventTypeT from JsonRpcPeer
  */
 class Event
 {
+    /**
+     * @var JsonRpcEventTypeT
+     */
     public string $type;
 
     public string $payload;

src/JsonRpc/JsonRpcPeer.php

@@ -12,7 +12,6 @@
 use Amp\Websocket\WebsocketClient;
 use Closure;
 use Flat3\RevPi\Exceptions\RemoteDeviceException;
-use Flat3\RevPi\Interfaces\Hardware\Device;
 use Flat3\RevPi\JsonRpc\Request as JsonRpcRequest;
 use Flat3\RevPi\JsonRpc\Response as JsonRpcResponse;
 use Throwable;
@@ -22,7 +21,8 @@
 /**
  * @phpstan-type JsonRpcDeviceMethodT 'open'|'close'|'lseek'|'ioctl'|'read'|'write'|'cfgetispeed'|'cfgetospeed'|'cfsetispeed'|'cfsetospeed'|'tcflush'|'tcdrain'|'tcsendbreak'|'fdopen'
  * @phpstan-type JsonRpcMethodT JsonRpcDeviceMethodT
- * @phpstan-type JsonRpcEventTypeT 'readable'
+ * @phpstan-type JsonRpcDeviceEventTypeT 'readable'
+ * @phpstan-type JsonRpcEventTypeT JsonRpcDeviceEventTypeT
  * @phpstan-type JsonRpcRequestParamsT array<string, int|string|null>
  * @phpstan-type JsonRpcRequestT array{id: string, method: JsonRpcMethodT, params: JsonRpcRequestParamsT }
  * @phpstan-type JsonRpcResponseResultT int|string|array<string, int|string|null>
@@ -33,18 +33,26 @@ abstract class JsonRpcPeer implements WebsocketClientHandler
 {
     protected WebsocketClient $socket;
 
-    protected Device $device;
-
     /**
-     * @var callable
+     * @var array{readable: array<callable>}
      */
-    protected mixed $eventReceiver;
+    protected array $callbacks = [
+        'readable' => [],
+    ];
 
     /**
      * @var array<DeferredFuture<JsonRpcResponseResultT>>
      */
     protected array $pending = [];
 
+    /**
+     * @param  JsonRpcDeviceEventTypeT  $event
+     */
+    public function on(string $event, Closure $callback): void
+    {
+        $this->callbacks[$event][] = $callback;
+    }
+
     public function withSocket(WebsocketClient $socket): self
     {
         $this->socket = $socket;
@@ -85,7 +93,7 @@ protected function handleResponse(): void
                 $response = unserialize($payload);
 
                 if ($response instanceof Event) {
-                    call_user_func($this->eventReceiver, $response);
+                    collect($this->callbacks[$response->type])->each(fn ($callback) => $callback($response->payload));
 
                     continue;
                 }
@@ -121,11 +129,6 @@ protected function handleResponse(): void
         }
     }
 
-    public function on(Closure $callback): void
-    {
-        $this->eventReceiver = $callback;
-    }
-
     public function handleClient(WebsocketClient $client, Request $request, Response $response): void
     {
         $this->socket = $client;