[general] Testing fixes (#243)

Author: actions-user

.editorconfig

@@ -4,7 +4,7 @@ end_of_line = lf
 indent_size = 4
 indent_style = space
 insert_final_newline = false
-max_line_length = 150
+max_line_length = 120
 tab_width = 4
 ij_continuation_indent_size = 8
 ij_formatter_off_tag = @formatter:off

.github/workflows/ci.yaml

@@ -27,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ "8.1", "8.2" ]
+        php-version: [ "8.2" ]
         operating-system: [ "ubuntu-latest" ]
 
     steps:
@@ -77,7 +77,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ "8.1", "8.2" ]
+        php-version: [ "8.2" ]
         operating-system: [ "ubuntu-latest" ]
 
     steps:
@@ -128,7 +128,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ "8.1", "8.2" ]
+        php-version: [ "8.2" ]
         operating-system: [ "ubuntu-latest" ]
 
     steps:
@@ -339,7 +339,7 @@ jobs:
 
     strategy:
       matrix:
-        php-version: [ "8.1", "8.2" ]
+        php-version: [ "8.2" ]
         operating-system: [ "ubuntu-latest" ]
       fail-fast: false
 

README.md

@@ -36,7 +36,7 @@ and is licensed under [Apache2](http://www.apache.org/licenses/LICENSE-2.0).
 
 ## Requirements
 
-Shelly connector is tested against PHP 8.1 and require installed [Process Control](https://www.php.net/manual/en/book.pcntl.php)
+Shelly connector is tested against PHP 8.2 and require installed [Process Control](https://www.php.net/manual/en/book.pcntl.php)
 PHP extension.
 
 ## Installation

composer.json

@@ -33,20 +33,20 @@
     "source": "https://github.com/FastyBird/shelly-connector"
   },
   "require": {
-    "php": ">=8.1.0",
+    "php": ">=8.2.0",
     "ext-pcntl": "*",
     "clue/multicast-react": "^1.1",
     "contributte/console": "^0.9",
     "contributte/monolog": "^0.5",
     "contributte/translation": "^2.0",
     "cweagans/composer-patches": "^1.7",
-    "evenement/evenement": "^3.0",
-    "fastybird/bootstrap-library": "dev-main",
+    "fastybird/application-library": "dev-main",
     "fastybird/datetime-factory": "^0.6",
     "fastybird/devices-module": "dev-main",
     "fastybird/metadata-library": "dev-main",
     "guzzlehttp/guzzle": "^7.5",
     "nette/di": "^3.0",
+    "orisai/nette-object-mapper": "^0.1",
     "psr/log": "^3.0",
     "ratchet/pawl": "^0.4",
     "react/async": "^4.0",
@@ -110,12 +110,6 @@
       }
     }
   },
-  "repositories": [
-    {
-      "type": "vcs",
-      "url": "https://github.com/mathsolver/mathsolver.git"
-    }
-  ],
   "minimum-stability": "dev",
   "prefer-stable": true
 }

resources/gen2_components.json

@@ -276,9 +276,9 @@
     "relative_humidity": {
       "optional": false,
       "name": "Relative Humidity",
-      "data_type": "float",
+      "data_type": "uchar",
       "unit": "%",
-      "format": null,
+      "format": [0, 100],
       "invalid": null,
       "queryable": true,
       "settable": false

src/API/ConnectionManager.php

@@ -15,12 +15,15 @@
 
 namespace FastyBird\Connector\Shelly\API;
 
+use FastyBird\Connector\Shelly\Documents;
 use FastyBird\Connector\Shelly\Entities;
+use FastyBird\Connector\Shelly\Exceptions;
 use FastyBird\Connector\Shelly\Helpers;
-use FastyBird\Library\Metadata\Documents as MetadataDocuments;
 use FastyBird\Library\Metadata\Exceptions as MetadataExceptions;
 use FastyBird\Module\Devices\Exceptions as DevicesExceptions;
 use Nette;
+use TypeError;
+use ValueError;
 use function array_key_exists;
 
 /**
@@ -84,11 +87,14 @@ public function getGen2HttpApiConnection(): Gen2HttpApi
 
 	/**
 	 * @throws DevicesExceptions\InvalidState
+	 * @throws Exceptions\InvalidArgument
 	 * @throws MetadataExceptions\InvalidArgument
 	 * @throws MetadataExceptions\InvalidState
+	 * @throws TypeError
+	 * @throws ValueError
 	 */
 	public function getGen2WsApiConnection(
-		Entities\ShellyDevice|MetadataDocuments\DevicesModule\Device $device,
+		Entities\Devices\Device|Documents\Devices\Device $device,
 	): Gen2WsApi
 	{
 		if (!array_key_exists($device->getId()->toString(), $this->gen2WsApiConnection)) {
@@ -106,12 +112,17 @@ public function getGen2WsApiConnection(
 
 	/**
 	 * @throws DevicesExceptions\InvalidState
+	 * @throws Exceptions\InvalidArgument
 	 * @throws MetadataExceptions\InvalidArgument
 	 * @throws MetadataExceptions\InvalidState
+	 * @throws TypeError
+	 * @throws ValueError
 	 */
-	private function getIpAddress(Entities\ShellyDevice|MetadataDocuments\DevicesModule\Device $device): string|null
+	private function getIpAddress(
+		Entities\Devices\Device|Documents\Devices\Device $device,
+	): string|null
 	{
-		if ($device instanceof Entities\ShellyDevice) {
+		if ($device instanceof Entities\Devices\Device) {
 			return $device->getIpAddress();
 		}
 
@@ -120,12 +131,17 @@ private function getIpAddress(Entities\ShellyDevice|MetadataDocuments\DevicesMod
 
 	/**
 	 * @throws DevicesExceptions\InvalidState
+	 * @throws Exceptions\InvalidArgument
 	 * @throws MetadataExceptions\InvalidArgument
 	 * @throws MetadataExceptions\InvalidState
+	 * @throws TypeError
+	 * @throws ValueError
 	 */
-	private function getDomain(Entities\ShellyDevice|MetadataDocuments\DevicesModule\Device $device): string|null
+	private function getDomain(
+		Entities\Devices\Device|Documents\Devices\Device $device,
+	): string|null
 	{
-		if ($device instanceof Entities\ShellyDevice) {
+		if ($device instanceof Entities\Devices\Device) {
 			return $device->getDomain();
 		}
 
@@ -134,12 +150,17 @@ private function getDomain(Entities\ShellyDevice|MetadataDocuments\DevicesModule
 
 	/**
 	 * @throws DevicesExceptions\InvalidState
+	 * @throws Exceptions\InvalidArgument
 	 * @throws MetadataExceptions\InvalidArgument
 	 * @throws MetadataExceptions\InvalidState
+	 * @throws TypeError
+	 * @throws ValueError
 	 */
-	private function getUsername(Entities\ShellyDevice|MetadataDocuments\DevicesModule\Device $device): string|null
+	private function getUsername(
+		Entities\Devices\Device|Documents\Devices\Device $device,
+	): string|null
 	{
-		if ($device instanceof Entities\ShellyDevice) {
+		if ($device instanceof Entities\Devices\Device) {
 			return $device->getUsername();
 		}
 
@@ -148,12 +169,17 @@ private function getUsername(Entities\ShellyDevice|MetadataDocuments\DevicesModu
 
 	/**
 	 * @throws DevicesExceptions\InvalidState
+	 * @throws Exceptions\InvalidArgument
 	 * @throws MetadataExceptions\InvalidArgument
 	 * @throws MetadataExceptions\InvalidState
+	 * @throws TypeError
+	 * @throws ValueError
 	 */
-	private function getPassword(Entities\ShellyDevice|MetadataDocuments\DevicesModule\Device $device): string|null
+	private function getPassword(
+		Entities\Devices\Device|Documents\Devices\Device $device,
+	): string|null
 	{
-		if ($device instanceof Entities\ShellyDevice) {
+		if ($device instanceof Entities\Devices\Device) {
 			return $device->getPassword();
 		}
 

src/API/Gen1Coap.php

@@ -16,9 +16,8 @@
 namespace FastyBird\Connector\Shelly\API;
 
 use BadMethodCallException;
-use Evenement;
+use Closure;
 use FastyBird\Connector\Shelly;
-use FastyBird\Connector\Shelly\Entities;
 use FastyBird\Connector\Shelly\Exceptions;
 use FastyBird\Connector\Shelly\Helpers;
 use FastyBird\Connector\Shelly\Services;
@@ -51,28 +50,32 @@
  *
  * @author         Adam Kadlec <[email protected]>
  */
-final class Gen1Coap implements Evenement\EventEmitterInterface
+final class Gen1Coap
 {
 
 	use Nette\SmartObject;
-	use Evenement\EventEmitterTrait;
-
-	private const COAP_ADDRESS = '224.0.1.187';
-
-	private const COAP_PORT = 5_683;
 
 	private const STATE_MESSAGE_CODE = 30;
 
 	private const STATE_MESSAGE_SCHEMA_FILENAME = 'gen1_coap_state.json';
 
+	/** @var array<Closure(Messages\Message $message): void> */
+	public array $onMessage = [];
+
+	/** @var array<Closure(): void> */
+	public array $onClosed = [];
+
+	/** @var array<Closure(Throwable $error): void> */
+	public array $onError = [];
+
 	/** @var array<string, string> */
 	private array $validationSchemas = [];
 
 	private Datagram\SocketInterface|null $server = null;
 
 	public function __construct(
 		private readonly Services\MulticastFactory $multicastFactory,
-		private readonly Helpers\Entity $entityHelper,
+		private readonly Helpers\MessageBuilder $messageBuilder,
 		private readonly Shelly\Logger $logger,
 		private readonly MetadataSchemas\Validator $schemaValidator,
 	)
@@ -85,26 +88,29 @@ public function __construct(
 	 */
 	public function connect(): void
 	{
-		$this->server = $this->multicastFactory->create(self::COAP_ADDRESS, self::COAP_PORT);
+		$this->server = $this->multicastFactory->create(
+			Shelly\Constants::COAP_ADDRESS,
+			Shelly\Constants::COAP_PORT,
+		);
 
 		$this->server->on('message', function ($message, $remote): void {
 			$this->handlePacket($message, $remote);
 		});
 
 		$this->server->on('error', function (Throwable $ex): void {
-			$this->emit('error', [$ex]);
+			Utils\Arrays::invoke($this->onError, $ex);
 		});
 
 		$this->server->on('close', function (): void {
 			$this->logger->debug(
 				'CoAP connection was successfully closed',
 				[
-					'source' => MetadataTypes\ConnectorSource::SOURCE_CONNECTOR_SHELLY,
+					'source' => MetadataTypes\Sources\Connector::SHELLY->value,
 					'type' => 'gen1-coap-api',
 				],
 			);
 
-			$this->emit('closed');
+			Utils\Arrays::invoke($this->onClosed);
 		});
 	}
 
@@ -202,7 +208,7 @@ private function handlePacket(string $packet, string $remote): void
 					str_replace(' ', '', $message),
 				),
 				[
-					'source' => MetadataTypes\ConnectorSource::SOURCE_CONNECTOR_SHELLY,
+					'source' => MetadataTypes\Sources\Connector::SHELLY->value,
 					'type' => 'gen1-coap-api',
 				],
 			);
@@ -215,7 +221,7 @@ private function handlePacket(string $packet, string $remote): void
 				try {
 					$this->handleStatusMessage($deviceIdentifier, $message, $remote);
 				} catch (Exceptions\CoapError | Exceptions\InvalidState $ex) {
-					$this->emit('error', [$ex]);
+					Utils\Arrays::invoke($this->onError, $ex);
 				}
 			}
 		}
@@ -267,18 +273,19 @@ private function handleStatusMessage(
 		}
 
 		try {
-			$this->emit('message', [
-				$this->entityHelper->create(
-					Entities\API\Gen1\ReportDeviceState::class,
+			Utils\Arrays::invoke(
+				$this->onMessage,
+				$this->messageBuilder->create(
+					Messages\Response\Gen1\ReportDeviceState::class,
 					[
 						'identifier' => $deviceIdentifier,
 						'ip_address' => preg_replace('/(:[0-9]+)+$/', '', $remote),
 						'states' => $statuses,
 					],
 				),
-			]);
+			);
 		} catch (Exceptions\Runtime $ex) {
-			throw new Exceptions\InvalidState('Could not map payload to entity', $ex->getCode(), $ex);
+			throw new Exceptions\InvalidState('Could not map payload to message', $ex->getCode(), $ex);
 		}
 	}