Updates

Author: 27pchrisl

src/IO/IO.php

@@ -5,7 +5,7 @@
 namespace Flat3\RevPi\IO;
 
 use Flat3\RevPi\Interfaces\Module;
-use Flat3\RevPi\Monitors\DigitalMonitor;
+use Flat3\RevPi\Interfaces\Monitor;
 
 abstract class IO
 {
@@ -20,9 +20,9 @@ public function get(): int|bool
         return $this->module->getProcessImage()->readVariable($this->name);
     }
 
-    public function monitor(callable $callback): void
+    public function monitor(Monitor $monitor, callable $callback): void
     {
-        $this->module->monitor(new DigitalMonitor($this->name, $callback));
+        $this->module->monitor($this->name, $monitor, $callback);
     }
 
     public function default(): int|bool

src/Interfaces/Module.php

@@ -5,7 +5,6 @@
 namespace Flat3\RevPi\Interfaces;
 
 use Flat3\RevPi\Led\LedPosition;
-use Flat3\RevPi\Monitors\Monitor;
 
 /**
  * Interface Module
@@ -38,9 +37,11 @@ public function resume(): void;
     /**
      * Attach a monitor to the module for status tracking or event watching.
      *
+     * @param  string  $variable  The variable to monitor.
      * @param  Monitor  $monitor  The monitor instance to attach.
+     * @param  callable  $callback  The callback to call.
      */
-    public function monitor(Monitor $monitor): void;
+    public function monitor(string $variable, Monitor $monitor, callable $callback): void;
 
     /**
      * Get a serial port instance for communication on the specified device path.

src/Interfaces/Modules/Remote.php

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

src/Interfaces/Monitor.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Flat3\RevPi\Interfaces;
+
+interface Monitor
+{
+    public function evaluate(mixed $previous, mixed $next): bool;
+}

src/JsonRpc/Event.php

@@ -20,6 +20,7 @@ class Event
     public function __serialize(): array
     {
         return [
+            'jsonrpc' => '2.0',
             'type' => $this->type,
             'payload' => $this->payload,
         ];

src/Modules/Module.php

@@ -7,17 +7,17 @@
 use Flat3\RevPi\Constants;
 use Flat3\RevPi\Events\PollingEvent;
 use Flat3\RevPi\Interfaces\Module as ModuleInterface;
+use Flat3\RevPi\Interfaces\Monitor;
 use Flat3\RevPi\Interfaces\ProcessImage;
 use Flat3\RevPi\Interfaces\SerialPort;
-use Flat3\RevPi\Monitors\Monitor;
 use Illuminate\Support\Facades\Event;
 use Revolt\EventLoop;
 
 abstract class Module implements ModuleInterface
 {
     protected ?string $pollingCallbackId = null;
 
-    protected float $frequency = Constants::f1Hz;
+    protected float $frequency = Constants::f25Hz;
 
     protected ?ProcessImage $processImage = null;
 
@@ -60,15 +60,17 @@ public function cancel(): void
         $this->pollingCallbackId = null;
     }
 
-    public function monitor(Monitor $monitor): void
+    public function monitor(string $variable, Monitor $monitor, callable $callback): void
     {
-        Event::listen(PollingEvent::class, function () use ($monitor) {
+        Event::listen(PollingEvent::class, function () use ($callback, $variable, $monitor) {
             static $previous = null;
 
-            $next = $this->getProcessImage()->readVariable($monitor->name);
+            $next = $this->getProcessImage()->readVariable($variable);
 
             if ($previous !== null && $previous !== $next) {
-                EventLoop::defer(fn () => $monitor->evaluate($previous, $next));
+                if ($monitor->evaluate($previous, $next)) {
+                    $callback($next);
+                }
             }
 
             $previous = $next;

src/Modules/Remote.php

@@ -13,6 +13,7 @@
 use Flat3\RevPi\Interfaces\SerialPort;
 use Flat3\RevPi\Led\LedPosition;
 use Flat3\RevPi\Led\RemoteLed;
+use Psr\Http\Message\UriInterface as PsrUri;
 
 use function Amp\Websocket\Client\connect;
 
@@ -47,8 +48,12 @@ public function getSerialPort(string $devicePath): SerialPort
         return app(SerialPort::class, ['devicePath' => $devicePath, 'device' => $terminal]);
     }
 
-    public function handshake(WebsocketHandshake $handshake): void
+    public function handshake(WebsocketHandshake|PsrUri|string $handshake): void
     {
+        if (! $handshake instanceof WebsocketHandshake) {
+            $handshake = new WebsocketHandshake($handshake);
+        }
+
         $this->handshake = $handshake;
     }
 }

src/Monitors/DigitalMonitor.php

@@ -4,10 +4,12 @@
 
 namespace Flat3\RevPi\Monitors;
 
-class DigitalMonitor extends Monitor
+use Flat3\RevPi\Interfaces\Monitor;
+
+class DigitalMonitor implements Monitor
 {
-    public function evaluate(mixed $previous, mixed $next): void
+    public function evaluate(mixed $previous, mixed $next): bool
     {
-        call_user_func($this->callback, $next);
+        return $previous !== $next;
     }
 }

src/Monitors/Monitor.php

@@ -22,7 +22,7 @@
 
 trait RevolutionPi
 {
-    protected ?WebsocketHandshake $handshake = null;
+    protected WebsocketHandshake|PsrUri|string|null $handshake = null;
 
     protected ?Module $module = null;
 
@@ -48,10 +48,6 @@ public function module(): Module
      */
     public function remote(WebsocketHandshake|PsrUri|string $handshake): static
     {
-        if (! $handshake instanceof WebsocketHandshake) {
-            $handshake = new WebsocketHandshake($handshake);
-        }
-
         $this->handshake = $handshake;
 
         return $this;