[general] Upgraded date time factory dueto testing issues (#311)

composer.json

@@ -48,7 +48,7 @@
     "fastybird/tools-library": "dev-main",
     "guzzlehttp/guzzle": "^7.5",
     "nette/di": "^3.0",
-    "orisai/nette-object-mapper": "^0.1",
+    "orisai/object-mapper": "^0.2",
     "psr/log": "^3.0",
     "ratchet/pawl": "^0.4",
     "react/async": "^4.0",

src/API/CloudApi.php

@@ -117,7 +117,7 @@ public function __construct(
 		private readonly Helpers\MessageBuilder $entityHelper,
 		private readonly Sonoff\Logger $logger,
 		private readonly MetadataSchemas\Validator $schemaValidator,
-		private readonly DateTimeFactory\Factory $dateTimeFactory,
+		private readonly DateTimeFactory\Clock $clock,
 		Types\Region|null $region = null,
 	)
 	{
@@ -137,7 +137,7 @@ public function connect(): void
 		$this->accessToken = $result->getAccessToken();
 		$this->refreshToken = $result->getRefreshToken();
 		$this->user = $result->getUser();
-		$this->tokensAcquired = $this->dateTimeFactory->getNow();
+		$this->tokensAcquired = $this->clock->getNow();
 
 		$this->region = $result->getRegion();
 	}
@@ -1144,7 +1144,7 @@ private function callRequest(
 
 		if (
 			str_contains(strval($request->getUri()), self::USER_REFRESH_API_ENDPOINT)
-			&& $this->tokensAcquired?->diff($this->dateTimeFactory->getNow())->s >= self::ACCESS_TOKEN_VALID_TIME
+			&& $this->tokensAcquired?->diff($this->clock->getNow())->s >= self::ACCESS_TOKEN_VALID_TIME
 			&& $this->refreshToken !== null
 		) {
 			try {

src/API/CloudWs.php

@@ -134,7 +134,7 @@ public function __construct(
 		private readonly Helpers\MessageBuilder $entityHelper,
 		private readonly Sonoff\Logger $logger,
 		private readonly MetadataSchemas\Validator $schemaValidator,
-		private readonly DateTimeFactory\Factory $dateTimeFactory,
+		private readonly DateTimeFactory\Clock $clock,
 		private readonly ObjectMapper\Processing\Processor $objectMapper,
 		private readonly EventLoop\LoopInterface $eventLoop,
 	)
@@ -150,7 +150,7 @@ public function connect(): Promise\PromiseInterface
 		$this->connecting = true;
 		$this->connected = false;
 
-		$this->lastConnectAttempt = $this->dateTimeFactory->getNow();
+		$this->lastConnectAttempt = $this->clock->getNow();
 		$this->lost = null;
 		$this->disconnected = null;
 
@@ -286,7 +286,7 @@ public function disconnect(): void
 		$this->connecting = false;
 		$this->connected = false;
 
-		$this->disconnected = $this->dateTimeFactory->getNow();
+		$this->disconnected = $this->clock->getNow();
 
 		if ($this->pingTimer !== null) {
 			$this->eventLoop->cancelTimer($this->pingTimer);
@@ -333,7 +333,7 @@ public function readStates(string $id, string $apiKey): Promise\PromiseInterface
 		$message->selfApikey = $this->apiKey;
 		$message->deviceid = $id;
 		$message->userAgent = 'app';
-		$message->sequence = strval(intval($this->dateTimeFactory->getNow()->format('Uv')));
+		$message->sequence = strval(intval($this->clock->getNow()->format('Uv')));
 		$message->params = [];
 
 		$this->sendRequest($message, $message->action, $message->sequence, $deferred);
@@ -376,7 +376,7 @@ public function writeState(
 		$message->selfApikey = $this->apiKey;
 		$message->deviceid = $id;
 		$message->userAgent = 'app';
-		$message->sequence = strval(intval($this->dateTimeFactory->getNow()->format('Uv')));
+		$message->sequence = strval(intval($this->clock->getNow()->format('Uv')));
 		$message->params = $params;
 
 		$this->sendRequest($message, $message->action, $message->sequence, $deferred);
@@ -430,7 +430,7 @@ private function doWsHandshake(): Promise\PromiseInterface
 			);
 		}
 
-		$timestamp = $this->dateTimeFactory->getNow()->getTimestamp();
+		$timestamp = $this->clock->getNow()->getTimestamp();
 
 		$message = new stdClass();
 		$message->action = self::USER_ONLINE_ACTION;
@@ -440,7 +440,7 @@ private function doWsHandshake(): Promise\PromiseInterface
 		$message->nonce = strval(intval($timestamp / 100));
 		$message->ts = $timestamp;
 		$message->userAgent = 'app';
-		$message->sequence = strval(intval($this->dateTimeFactory->getNow()->format('Uv')));
+		$message->sequence = strval(intval($this->clock->getNow()->format('Uv')));
 		$message->version = 8;
 
 		$this->sendRequest($message, $message->action, $message->sequence, $deferred);
@@ -450,7 +450,7 @@ private function doWsHandshake(): Promise\PromiseInterface
 
 	private function lost(): void
 	{
-		$this->lost = $this->dateTimeFactory->getNow();
+		$this->lost = $this->clock->getNow();
 
 		Utils\Arrays::invoke($this->onLost);
 

src/API/LanApi.php

@@ -116,7 +116,7 @@ public function __construct(
 		private readonly Services\MulticastFactory $multicastFactory,
 		private readonly Helpers\MessageBuilder $entityHelper,
 		private readonly Sonoff\Logger $logger,
-		private readonly DateTimeFactory\Factory $dateTimeFactory,
+		private readonly DateTimeFactory\Clock $clock,
 		private readonly EventLoop\LoopInterface $eventLoop,
 		private readonly MetadataSchemas\Validator $schemaValidator,
 	)
@@ -311,7 +311,7 @@ public function getDeviceInfo(
 		$deferred = new Promise\Deferred();
 
 		$payload = new stdClass();
-		$payload->sequence = strval(intval($this->dateTimeFactory->getNow()->format('Uv')));
+		$payload->sequence = strval(intval($this->clock->getNow()->format('Uv')));
 		$payload->deviceid = $id;
 		$payload->selfApikey = '123';
 		$payload->data = new stdClass();
@@ -418,7 +418,7 @@ public function setDeviceState(
 		}
 
 		$payload = new stdClass();
-		$payload->sequence = strval(intval($this->dateTimeFactory->getNow()->format('Uv')));
+		$payload->sequence = strval(intval($this->clock->getNow()->format('Uv')));
 		$payload->deviceid = $id;
 		$payload->selfApikey = '123';
 		$payload->data = $params;

src/Clients/Auto.php

@@ -54,7 +54,7 @@ final class Auto extends ClientProcess implements Client
 	public function __construct(
 		Helpers\Device $deviceHelper,
 		DevicesUtilities\DeviceConnection $deviceConnectionManager,
-		DateTimeFactory\Factory $dateTimeFactory,
+		DateTimeFactory\Clock $clock,
 		EventLoop\LoopInterface $eventLoop,
 		private readonly Documents\Connectors\Connector $connector,
 		private readonly LanFactory $lanClientFactory,
@@ -64,7 +64,7 @@ public function __construct(
 		parent::__construct(
 			$deviceHelper,
 			$deviceConnectionManager,
-			$dateTimeFactory,
+			$clock,
 			$eventLoop,
 		);
 	}

src/Clients/ClientProcess.php

@@ -72,7 +72,7 @@ abstract class ClientProcess
 	public function __construct(
 		protected readonly Helpers\Device $deviceHelper,
 		protected readonly DevicesUtilities\DeviceConnection $deviceConnectionManager,
-		protected readonly DateTimeFactory\Factory $dateTimeFactory,
+		protected readonly DateTimeFactory\Clock $clock,
 		protected readonly EventLoop\LoopInterface $eventLoop,
 	)
 	{
@@ -154,15 +154,15 @@ protected function readDeviceInformation(Documents\Devices\Device $device): bool
 			if (
 				$cmdResult instanceof DateTimeInterface
 				&& (
-					$this->dateTimeFactory->getNow()->getTimestamp() - $cmdResult->getTimestamp()
+					$this->clock->getNow()->getTimestamp() - $cmdResult->getTimestamp()
 					< $this->deviceHelper->getHeartbeatDelay($device)
 				)
 			) {
 				return false;
 			}
 		}
 
-		$this->processedDevicesCommands[$device->getId()->toString()][self::CMD_HEARTBEAT] = $this->dateTimeFactory->getNow();
+		$this->processedDevicesCommands[$device->getId()->toString()][self::CMD_HEARTBEAT] = $this->clock->getNow();
 
 		$deviceState = $this->deviceConnectionManager->getState($device);
 
@@ -174,7 +174,7 @@ protected function readDeviceInformation(Documents\Devices\Device $device): bool
 
 		$this->readInformation($device)
 			->then(function () use ($device): void {
-				$this->processedDevicesCommands[$device->getId()->toString()][self::CMD_HEARTBEAT] = $this->dateTimeFactory->getNow();
+				$this->processedDevicesCommands[$device->getId()->toString()][self::CMD_HEARTBEAT] = $this->clock->getNow();
 			});
 
 		return true;
@@ -204,15 +204,15 @@ protected function readDeviceState(Documents\Devices\Device $device): bool
 			if (
 				$cmdResult instanceof DateTimeInterface
 				&& (
-					$this->dateTimeFactory->getNow()->getTimestamp() - $cmdResult->getTimestamp()
+					$this->clock->getNow()->getTimestamp() - $cmdResult->getTimestamp()
 					< $this->deviceHelper->getStateReadingDelay($device)
 				)
 			) {
 				return false;
 			}
 		}
 
-		$this->processedDevicesCommands[$device->getId()->toString()][self::CMD_STATE] = $this->dateTimeFactory->getNow();
+		$this->processedDevicesCommands[$device->getId()->toString()][self::CMD_STATE] = $this->clock->getNow();
 
 		$deviceState = $this->deviceConnectionManager->getState($device);
 
@@ -224,7 +224,7 @@ protected function readDeviceState(Documents\Devices\Device $device): bool
 
 		$this->readState($device)
 			->then(function () use ($device): void {
-				$this->processedDevicesCommands[$device->getId()->toString()][self::CMD_STATE] = $this->dateTimeFactory->getNow();
+				$this->processedDevicesCommands[$device->getId()->toString()][self::CMD_STATE] = $this->clock->getNow();
 			});
 
 		return true;

src/Clients/Cloud.php

@@ -55,7 +55,7 @@ final class Cloud extends ClientProcess implements Client
 	public function __construct(
 		Helpers\Device $deviceHelper,
 		DevicesUtilities\DeviceConnection $deviceConnectionManager,
-		DateTimeFactory\Factory $dateTimeFactory,
+		DateTimeFactory\Clock $clock,
 		EventLoop\LoopInterface $eventLoop,
 		private readonly Documents\Connectors\Connector $connector,
 		private readonly bool $autoMode,
@@ -70,7 +70,7 @@ public function __construct(
 		parent::__construct(
 			$deviceHelper,
 			$deviceConnectionManager,
-			$dateTimeFactory,
+			$clock,
 			$eventLoop,
 		);
 	}

src/Clients/Lan.php

@@ -58,7 +58,7 @@ final class Lan extends ClientProcess implements Client
 	public function __construct(
 		Helpers\Device $deviceHelper,
 		DevicesUtilities\DeviceConnection $deviceConnectionManager,
-		DateTimeFactory\Factory $dateTimeFactory,
+		DateTimeFactory\Clock $clock,
 		EventLoop\LoopInterface $eventLoop,
 		private readonly Documents\Connectors\Connector $connector,
 		private readonly bool $autoMode,
@@ -73,7 +73,7 @@ public function __construct(
 		parent::__construct(
 			$deviceHelper,
 			$deviceConnectionManager,
-			$dateTimeFactory,
+			$clock,
 			$eventLoop,
 		);
 	}

src/Commands/Discover.php

@@ -63,7 +63,7 @@ public function __construct(
 		private readonly Helpers\Device $deviceHelper,
 		private readonly DevicesModels\Configuration\Connectors\Repository $connectorsConfigurationRepository,
 		private readonly DevicesModels\Configuration\Devices\Repository $devicesConfigurationRepository,
-		private readonly DateTimeFactory\Factory $dateTimeFactory,
+		private readonly DateTimeFactory\Clock $clock,
 		private readonly Localization\Translator $translator,
 		string|null $name = null,
 	)
@@ -287,7 +287,7 @@ function (string|int|null $answer) use ($connectors): Documents\Connectors\Conne
 
 		$io->info((string) $this->translator->translate('//sonoff-connector.cmd.discover.messages.starting'));
 
-		$this->executedTime = $this->dateTimeFactory->getNow();
+		$this->executedTime = $this->clock->getNow();
 
 		$serviceCmd = $symfonyApp->find(DevicesCommands\Connector::NAME);
 

src/Commands/Install.php

@@ -75,7 +75,7 @@ public function __construct(
 		private readonly DevicesModels\Entities\Devices\DevicesRepository $devicesRepository,
 		private readonly DevicesModels\Entities\Devices\DevicesManager $devicesManager,
 		private readonly ApplicationHelpers\Database $databaseHelper,
-		private readonly DateTimeFactory\Factory $dateTimeFactory,
+		private readonly DateTimeFactory\Clock $clock,
 		private readonly Localization\Translator $translator,
 		string|null $name = null,
 	)
@@ -823,7 +823,7 @@ private function discoverDevices(Style\SymfonyStyle $io, Entities\Connectors\Con
 			throw new Exceptions\InvalidState('Something went wrong, console output is not configured');
 		}
 
-		$executedTime = $this->dateTimeFactory->getNow();
+		$executedTime = $this->clock->getNow();
 
 		$symfonyApp = $this->getApplication();
 

src/Queue/Consumers/WriteChannelPropertyState.php

@@ -73,7 +73,7 @@ public function __construct(
 		private readonly DevicesModels\Configuration\Channels\Repository $channelsConfigurationRepository,
 		private readonly DevicesModels\Configuration\Channels\Properties\Repository $channelsPropertiesConfigurationRepository,
 		private readonly DevicesModels\States\Async\ChannelPropertiesManager $channelPropertiesStatesManager,
-		private readonly DateTimeFactory\Factory $dateTimeFactory,
+		private readonly DateTimeFactory\Clock $clock,
 	)
 	{
 	}
@@ -274,7 +274,7 @@ public function consume(Queue\Messages\Message $message): bool
 			return true;
 		}
 
-		$now = $this->dateTimeFactory->getNow();
+		$now = $this->clock->getNow();
 		$pending = $state->getPending();
 
 		if (

src/Queue/Consumers/WriteDevicePropertyState.php

@@ -69,7 +69,7 @@ public function __construct(
 		private readonly DevicesModels\Configuration\Devices\Repository $devicesConfigurationRepository,
 		private readonly DevicesModels\Configuration\Devices\Properties\Repository $devicesPropertiesConfigurationRepository,
 		private readonly DevicesModels\States\Async\DevicePropertiesManager $devicePropertiesStatesManager,
-		private readonly DateTimeFactory\Factory $dateTimeFactory,
+		private readonly DateTimeFactory\Clock $clock,
 	)
 	{
 	}
@@ -224,7 +224,7 @@ public function consume(Queue\Messages\Message $message): bool
 			return true;
 		}
 
-		$now = $this->dateTimeFactory->getNow();
+		$now = $this->clock->getNow();
 		$pending = $state->getPending();
 
 		if (

src/Writers/Exchange.php

@@ -56,7 +56,7 @@ public function __construct(
 		DevicesModels\Configuration\Channels\Properties\Repository $channelsPropertiesConfigurationRepository,
 		DevicesModels\States\Async\DevicePropertiesManager $devicePropertiesStatesManager,
 		DevicesModels\States\Async\ChannelPropertiesManager $channelPropertiesStatesManager,
-		DateTimeFactory\Factory $dateTimeFactory,
+		DateTimeFactory\Clock $clock,
 		EventLoop\LoopInterface $eventLoop,
 		private readonly ExchangeConsumers\Container $consumer,
 	)
@@ -71,7 +71,7 @@ public function __construct(
 			$channelsPropertiesConfigurationRepository,
 			$devicePropertiesStatesManager,
 			$channelPropertiesStatesManager,
-			$dateTimeFactory,
+			$clock,
 			$eventLoop,
 		);
 

src/Writers/Periodic.php

@@ -83,7 +83,7 @@ public function __construct(
 		protected readonly DevicesModels\Configuration\Channels\Properties\Repository $channelsPropertiesConfigurationRepository,
 		private readonly DevicesModels\States\Async\DevicePropertiesManager $devicePropertiesStatesManager,
 		private readonly DevicesModels\States\Async\ChannelPropertiesManager $channelPropertiesStatesManager,
-		private readonly DateTimeFactory\Factory $dateTimeFactory,
+		private readonly DateTimeFactory\Clock $clock,
 		private readonly EventLoop\LoopInterface $eventLoop,
 	)
 	{
@@ -209,7 +209,7 @@ private function handleCommunication(): void
 	 */
 	private function writeProperty(Documents\Devices\Device $device): bool
 	{
-		$now = $this->dateTimeFactory->getNow();
+		$now = $this->clock->getNow();
 
 		foreach ($this->properties[$device->getId()->toString()] as $property) {
 			$debounce = array_key_exists($property->getId()->toString(), $this->processedProperties)