configurable checkInterval for waitUntil conditional checks,

extracting error message from the driver response

Author: itnelo

src/Client/W3CClient.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the ReactPHP WebDriver <https://github.com/itnelo/reactphp-webdriver>.
  *
- * (c) 2020 Pavel Petrov <itnelo@gmail.com>.
+ * (c) 2020-2021 Pavel Petrov <itnelo@gmail.com>.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -817,10 +817,14 @@ private function onCommandConfirmation(ResponseInterface $response, string $erro
     {
         $responseValueNode = $this->deserializeResponse($response);
 
-        // todo: locate an error message or set it as "undefined error"
-        if (null !== $responseValueNode) {
-            throw new RuntimeException($errorMessage);
+        if (null === $responseValueNode) {
+            return;
         }
+
+        $driverMessage            = $responseValueNode['message'] ?? 'undefined driver error';
+        $confirmationErrorMessage = sprintf('%s %s.', $errorMessage, $driverMessage);
+
+        throw new RuntimeException($confirmationErrorMessage);
     }
 
     /**

src/Routine/Condition/CheckRoutine.php

@@ -84,7 +84,7 @@ public function __construct(LoopInterface $loop, TimeoutInterceptor $timeoutInte
      *
      * @throws RuntimeException Whenever the routine is already in the running state
      */
-    public function run(callable $conditionMetCallback, float $checkInterval = 0.5): PromiseInterface
+    public function run(callable $conditionMetCallback, float $checkInterval): PromiseInterface
     {
         if ($this->_evaluationTimer instanceof TimerInterface) {
             throw new RuntimeException('Routine is already running.');

src/SeleniumHubDriver.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the ReactPHP WebDriver <https://github.com/itnelo/reactphp-webdriver>.
  *
- * (c) 2020 Pavel Petrov <itnelo@gmail.com>.
+ * (c) 2020-2021 Pavel Petrov <itnelo@gmail.com>.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -310,15 +310,21 @@ public function wait(float $time = 30.0): PromiseInterface
     /**
      * {@inheritDoc}
      */
-    public function waitUntil(callable $conditionMetCallback, float $time = 30.0): PromiseInterface
-    {
-        $timeNormalized = max(0.5, $time);
+    public function waitUntil(
+        callable $conditionMetCallback,
+        float $time = 30.0,
+        float $checkInterval = 0.5
+    ): PromiseInterface {
+        $timeNormalized          = max(0.5, $time);
+        $checkIntervalNormalized = max(0.1, $checkInterval);
 
         // todo: probably, should be redesigned, to reduce amount of "new" calls
         $timeoutInterceptor = new TimeoutInterceptor($this->loop, $timeNormalized);
         $checkRoutine       = new ConditionCheckRoutine($this->loop, $timeoutInterceptor);
 
-        return $checkRoutine->run($conditionMetCallback);
+        $conditionMetPromise = $checkRoutine->run($conditionMetCallback, $checkIntervalNormalized);
+
+        return $conditionMetPromise;
     }
 
     /**

src/WebDriverInterface.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the ReactPHP WebDriver <https://github.com/itnelo/reactphp-webdriver>.
  *
- * (c) 2020 Pavel Petrov <itnelo@gmail.com>.
+ * (c) 2020-2021 Pavel Petrov <itnelo@gmail.com>.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -116,10 +116,15 @@ public function wait(float $time = 30.0): PromiseInterface;
      * @param callable $conditionMetCallback A condition to be met, as a callback
      * @param float    $time                 Time (in seconds) to wait for successfully resolved promise from the
      *                                       condition callback (minimum: 0.5)
+     * @param float    $checkInterval        The interval for condition checks, in seconds (minimum: 0.1)
      *
      * @return PromiseInterface<mixed>
      */
-    public function waitUntil(callable $conditionMetCallback, float $time = 30.0): PromiseInterface;
+    public function waitUntil(
+        callable $conditionMetCallback,
+        float $time = 30.0,
+        float $checkInterval = 0.5
+    ): PromiseInterface;
 
     /**
      * Returns a promise that will be resolved if a screenshot is successfully received and saved using the specified