Updates

Author: 27pchrisl

src/Hardware/Remote/RemoteBlockDevice.php

@@ -10,6 +10,6 @@ abstract class RemoteBlockDevice extends RemoteDevice implements Seek
 {
     public function lseek(int $offset, int $whence): int
     {
-        return (int) $this->socket->request('lseek', ['offset' => $offset, 'whence' => $whence])->await();
+        return (int) $this->peer->request('lseek', ['offset' => $offset, 'whence' => $whence])->await();
     }
 }

src/Hardware/Remote/RemoteCharacterDevice.php

@@ -6,6 +6,7 @@
 
 use Flat3\RevPi\Interfaces\Hardware\Stream;
 use Flat3\RevPi\JsonRpc\Event;
+use Flat3\RevPi\JsonRpc\Peer;
 use Revolt\EventLoop;
 
 abstract class RemoteCharacterDevice extends RemoteDevice implements Stream
@@ -16,8 +17,10 @@ abstract class RemoteCharacterDevice extends RemoteDevice implements Stream
     /** @var resource */
     protected mixed $remote;
 
-    public function __construct()
+    public function __construct(Peer $peer)
     {
+        parent::__construct($peer);
+
         $sockets = stream_socket_pair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, STREAM_IPPROTO_IP);
         assert($sockets !== false);
         [$this->local, $this->remote] = $sockets;
@@ -27,9 +30,9 @@ public function __construct()
 
     public function fdopen(): mixed
     {
-        $this->socket->request('fdopen')->await();
+        $this->peer->request('fdopen')->await();
 
-        $this->socket->on(function (Event $event) {
+        $this->peer->on(function (Event $event) {
             if ($event->type === 'readable') {
                 fwrite($this->remote, $event->payload);
             }

src/Hardware/Remote/RemoteDevice.php

@@ -11,41 +11,41 @@
 
 abstract class RemoteDevice implements Device, Ioctl
 {
-    protected Peer $socket;
+    public function __construct(protected Peer $peer) {}
 
     public function socket(WebsocketClient $websocket): void
     {
-        $this->socket = Peer::initiate($websocket);
+        $this->peer->setSocket($websocket);
     }
 
     public function open(string $pathname, int $flags): int
     {
-        return (int) $this->socket->request('open', ['pathname' => $pathname, 'flags' => $flags])->await();
+        return (int) $this->peer->request('open', ['pathname' => $pathname, 'flags' => $flags])->await();
     }
 
     public function close(): int
     {
-        return (int) $this->socket->request('close')->await();
+        return (int) $this->peer->request('close')->await();
     }
 
     public function read(string &$buffer, int $count): int
     {
         /** @var array{buffer: string, return: int} $response */
-        $response = $this->socket->request('read', ['buffer' => $buffer, 'count' => $count])->await();
+        $response = $this->peer->request('read', ['buffer' => $buffer, 'count' => $count])->await();
         $buffer = $response['buffer'];
 
         return $response['return'];
     }
 
     public function write(string $buffer, int $count): int
     {
-        return (int) $this->socket->request('write', ['buffer' => $buffer, 'count' => $count])->await();
+        return (int) $this->peer->request('write', ['buffer' => $buffer, 'count' => $count])->await();
     }
 
     public function ioctl(int $request, ?string &$argp = null): int
     {
         /** @var array{argp: ?string, return: int} $response */
-        $response = $this->socket->request('ioctl', ['request' => $request, 'argp' => $argp])->await();
+        $response = $this->peer->request('ioctl', ['request' => $request, 'argp' => $argp])->await();
 
         $argp = $response['argp'];
 

src/Hardware/Remote/RemoteTerminalDevice.php

@@ -11,7 +11,7 @@ class RemoteTerminalDevice extends RemoteCharacterDevice implements Terminal
     public function cfgetispeed(string &$buffer): int
     {
         /** @var array{buffer: string, return: int} $response */
-        $response = $this->socket->request('cfgetispeed', ['buffer' => $buffer])->await();
+        $response = $this->peer->request('cfgetispeed', ['buffer' => $buffer])->await();
         $buffer = $response['buffer'];
 
         return $response['return'];
@@ -20,7 +20,7 @@ public function cfgetispeed(string &$buffer): int
     public function cfgetospeed(string &$buffer): int
     {
         /** @var array{buffer: string, return: int} $response */
-        $response = $this->socket->request('cfgetospeed', ['buffer' => $buffer])->await();
+        $response = $this->peer->request('cfgetospeed', ['buffer' => $buffer])->await();
         $buffer = $response['buffer'];
 
         return $response['return'];
@@ -29,7 +29,7 @@ public function cfgetospeed(string &$buffer): int
     public function cfsetispeed(string &$buffer, int $speed): int
     {
         /** @var array{buffer: string, return: int} $response */
-        $response = $this->socket->request('cfsetispeed', ['buffer' => $buffer, 'speed' => $speed])->await();
+        $response = $this->peer->request('cfsetispeed', ['buffer' => $buffer, 'speed' => $speed])->await();
         $buffer = $response['buffer'];
 
         return $response['return'];
@@ -38,24 +38,24 @@ public function cfsetispeed(string &$buffer, int $speed): int
     public function cfsetospeed(string &$buffer, int $speed): int
     {
         /** @var array{buffer: string, return: int} $response */
-        $response = $this->socket->request('cfsetospeed', ['buffer' => $buffer, 'speed' => $speed])->await();
+        $response = $this->peer->request('cfsetospeed', ['buffer' => $buffer, 'speed' => $speed])->await();
         $buffer = $response['buffer'];
 
         return $response['return'];
     }
 
     public function tcflush(int $queue_selector): int
     {
-        return (int) $this->socket->request('tcflush', ['queue_selector' => $queue_selector])->await();
+        return (int) $this->peer->request('tcflush', ['queue_selector' => $queue_selector])->await();
     }
 
     public function tcdrain(): int
     {
-        return (int) $this->socket->request('tcdrain')->await();
+        return (int) $this->peer->request('tcdrain')->await();
     }
 
     public function tcsendbreak(int $duration = 0): int
     {
-        return (int) $this->socket->request('tcsendbreak', ['duration' => $duration])->await();
+        return (int) $this->peer->request('tcsendbreak', ['duration' => $duration])->await();
     }
 }

src/JsonRpc/Peer.php

@@ -50,18 +50,10 @@ class Peer implements WebsocketClientHandler
      */
     protected array $pending = [];
 
-    public static function initiate(WebsocketClient $socket): self
-    {
-        $endpoint = new self;
-        $endpoint->setSocket($socket);
-        async(fn () => $endpoint->receiveLoop());
-
-        return $endpoint;
-    }
-
     public function setSocket(WebsocketClient $socket): self
     {
         $this->socket = $socket;
+        async(fn () => $this->receiveLoop());
 
         return $this;
     }
@@ -287,7 +279,7 @@ public function handleClient(
         Request $request,
         Response $response
     ): void {
-        $this->setSocket($client);
+        $this->socket = $client;
 
         while ($message = $client->receive()) {
             $request = $message->read();