Use optimistic state update (#315)

FastyBird · Sep 30, 2024 · b6331fe · b6331fe
1 parent d4f7c74
commit b6331fe
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/src/Queue/Consumers/WriteV1ChannelPropertyState.php b/src/Queue/Consumers/WriteV1ChannelPropertyState.php
@@ -34,7 +34,9 @@
 use FastyBird\Module\Devices\Exceptions as DevicesExceptions;
 use FastyBird\Module\Devices\Models as DevicesModels;
 use FastyBird\Module\Devices\Queries as DevicesQueries;
+use FastyBird\Module\Devices\States as DevicesStates;
 use Nette;
+use Nette\Utils;
 use RuntimeException;
 use Throwable;
 use TypeError;
@@ -297,7 +299,16 @@ public function consume(Queue\Messages\Message $message): bool
 				$topic,
 				strval($expectedValue),
 			)
-			->then(function () use ($connector, $device, $channel, $property, $message): void {
+			->then(function () use ($connector, $device, $channel, $property, $state, $message): void {
+				await($this->channelPropertiesStatesManager->set(
+					$property,
+					Utils\ArrayHash::from([
+						DevicesStates\Property::ACTUAL_VALUE_FIELD => $state->getExpectedValue(),
+						DevicesStates\Property::EXPECTED_VALUE_FIELD => null,
+					]),
+					MetadataTypes\Sources\Connector::SHELLY,
+				));
+
 				$this->logger->debug(
 					'Channel state was successfully sent to device',
 					[

diff --git a/src/Queue/Consumers/WriteV1DevicePropertyState.php b/src/Queue/Consumers/WriteV1DevicePropertyState.php
@@ -34,7 +34,9 @@
 use FastyBird\Module\Devices\Exceptions as DevicesExceptions;
 use FastyBird\Module\Devices\Models as DevicesModels;
 use FastyBird\Module\Devices\Queries as DevicesQueries;
+use FastyBird\Module\Devices\States as DevicesStates;
 use Nette;
+use Nette\Utils;
 use RuntimeException;
 use Throwable;
 use TypeError;
@@ -250,7 +252,16 @@ public function consume(Queue\Messages\Message $message): bool
 				$topic,
 				strval($expectedValue),
 			)
-			->then(function () use ($connector, $device, $property, $message): void {
+			->then(function () use ($connector, $device, $property, $state, $message): void {
+				await($this->devicePropertiesStatesManager->set(
+					$property,
+					Utils\ArrayHash::from([
+						DevicesStates\Property::ACTUAL_VALUE_FIELD => $state->getExpectedValue(),
+						DevicesStates\Property::EXPECTED_VALUE_FIELD => null,
+					]),
+					MetadataTypes\Sources\Connector::SHELLY,
+				));
+
 				$this->logger->debug(
 					'Channel state was successfully sent to device',
 					[