Merge pull request #16 from bytes-commerce/BC-XX-add-timeout-for-requests

BC-XX Add timeout to handle unavailable clients better.

Author: bytes-max

src/Resource/Client.php

@@ -28,7 +28,6 @@ public function __construct(
     public function __destruct()
     {
         if ($this->sid !== null) {
-            //$this->client->request(Request::METHOD_GET, sprintf('%s/webapi/Auth.cgi?api=SYNO.API.Auth&method=logout&version=1&_sid=%s', $this->targetUrl, $this->sid));
             $this->resetTokens();
         }
     }
@@ -43,6 +42,8 @@ public function request(AbstractActionItem $actionItem, array $parameters = []):
                 'Referer' => $this->referer,
                 'Cookie' => sprintf('id=%s', $this->sid),
             ],
+            'timeout' => 10,
+            'max_duration' => 10,
         ]);
 
         if ($actionItem->isMultipartForm()) {
@@ -179,10 +180,10 @@ private function checkParameters(AbstractActionItem $actionItem, array $paramete
         $availableKeys = $actionItem->getAvailableKeys();
         foreach (array_keys($parameters) as $key) {
             if (!in_array($key, $availableKeys, true) && (array_key_exists('optional', $availableKeys) && !in_array(
-                $key,
-                $availableKeys['optional'],
-                true,
-            ))) {
+                        $key,
+                        $availableKeys['optional'],
+                        true,
+                    ))) {
                 throw new \InvalidArgumentException(
                     sprintf(
                         'Invalid parameter "%s" for action item "%s", required keys are %s',

src/Resource/EndpointProvider.php

@@ -4,6 +4,7 @@
 
 namespace BytesCommerce\SynologyApi\Resource;
 
+use BytesCommerce\SynologyApi\Exceptions\NoConnectionException;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Contracts\Cache\ItemInterface;
 use Webmozart\Assert\Assert;
@@ -41,10 +42,17 @@ public function getEndpoints(string $targetUrl): array
 
                 curl_setopt($ch, \CURLOPT_REFERER, $referer);
                 curl_setopt($ch, \CURLOPT_RETURNTRANSFER, true);
+                curl_setopt($ch, \CURLOPT_TIMEOUT, 10);
+                curl_setopt($ch, \CURLOPT_CONNECTTIMEOUT, 3);
+
                 $response = curl_exec($ch);
                 Assert::same(0, curl_errno($ch));
                 curl_close($ch);
-                Assert::string($response);
+                try {
+                    Assert::string($response);
+                } catch (Throwable $e) {
+                    throw new NoConnectionException();
+                }
 
                 $result = json_decode($response, true);
                 if ($result !== null) {