[feat] handle timeout

tookantech · Apr 8, 2024 · 9a707cd · 9a707cd
1 parent ed5c45c
commit 9a707cd
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 7 deletions.
diff --git a/config/chapaar.php b/config/chapaar.php
@@ -18,6 +18,17 @@
      */
     'status' => false,
 
+    /*
+     * Timeout if a server does not return a response in seconds.
+     */
+    'timeout' => env('CHAPAAR_TIMEOUT', 30),
+
+    /*
+     * Connect timeout in seconds.
+     */
+    'connect_timeout' => env('CHAPAAR_CONNECT_TIMEOUT', 0),
+
+
     /*
      * Define configurations for different drivers
      */

diff --git a/src/Drivers/Farapayamak/FarapayamakConnector.php b/src/Drivers/Farapayamak/FarapayamakConnector.php
@@ -4,6 +4,7 @@
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\RequestOptions;
 use TookanTech\Chapaar\Contracts\DriverConnector;
 use TookanTech\Chapaar\Exceptions\ApiException;
 use TookanTech\Chapaar\Exceptions\HttpException;
@@ -21,11 +22,13 @@ public function __construct()
     {
         self::$setting = (object) config('chapaar.drivers.farapayamak');
         $this->client = new Client([
-            'headers' => [
+            RequestOptions::HEADERS => [
                 'Content-Type' => 'application/x-www-form-urlencoded',
                 'charset' => 'utf-8',
             ],
-            'http_errors' => false,
+            RequestOptions::HTTP_ERRORS => false,
+            RequestOptions::TIMEOUT => config('chapaar.timeout'),
+            RequestOptions::CONNECT_TIMEOUT => config('chapaar.connect_timeout'),
         ]);
 
     }

diff --git a/src/Drivers/Ghasedak/GhasedakConnector.php b/src/Drivers/Ghasedak/GhasedakConnector.php
@@ -4,6 +4,7 @@
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\RequestOptions;
 use Illuminate\Http\Response;
 use TookanTech\Chapaar\Contracts\DriverConnector;
 use TookanTech\Chapaar\Exceptions\ApiException;
@@ -22,11 +23,13 @@ public function __construct()
     {
         self::$setting = (object) config('chapaar.drivers.ghasedak');
         $this->client = new Client([
-            'headers' => [
+            RequestOptions::HEADERS => [
                 'apikey' => self::$setting->api_key,
                 'cache-control' => 'no-cache',
                 'content-type' => 'application/x-www-form-urlencoded',
             ],
+            RequestOptions::TIMEOUT => config('chapaar.timeout'),
+            RequestOptions::CONNECT_TIMEOUT => config('chapaar.connect_timeout'),
         ]);
 
     }

diff --git a/src/Drivers/Kavenegar/KavenegarConnector.php b/src/Drivers/Kavenegar/KavenegarConnector.php
@@ -4,6 +4,7 @@
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\RequestOptions;
 use Symfony\Component\HttpFoundation\Response;
 use TookanTech\Chapaar\Contracts\DriverConnector;
 use TookanTech\Chapaar\Exceptions\ApiException;
@@ -19,13 +20,15 @@ class KavenegarConnector implements DriverConnector
     public function __construct()
     {
         $this->client = (new Client([
-            'headers' => [
+            RequestOptions::HEADERS => [
                 'Accept' => 'application/json',
                 'Content-Type' => 'application/x-www-form-urlencoded',
                 'charset' => 'utf-8',
             ],
-            'verify' => false,
-            'http_errors' => false,
+            RequestOptions::VERIFY => false,
+            RequestOptions::HTTP_ERRORS => false,
+            RequestOptions::TIMEOUT => config('chapaar.timeout'),
+            RequestOptions::CONNECT_TIMEOUT => config('chapaar.connect_timeout'),
         ]));
         self::$setting = (object) config('chapaar.drivers.kavenegar');
     }

diff --git a/src/Drivers/SmsIr/SmsIrConnector.php b/src/Drivers/SmsIr/SmsIrConnector.php
@@ -4,6 +4,7 @@
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\RequestOptions;
 use TookanTech\Chapaar\Contracts\DriverConnector;
 use TookanTech\Chapaar\Exceptions\ApiException;
 use TookanTech\Chapaar\Exceptions\HttpException;
@@ -19,11 +20,13 @@ public function __construct()
     {
         self::$setting = (object) config('chapaar.drivers.smsir');
         $this->client = new Client([
-            'headers' => [
+            RequestOptions::HEADERS => [
                 'x-api-key' => self::$setting->api_key,
                 'Accept' => 'text/plain',
                 'Content-Type' => 'application/json',
             ],
+            RequestOptions::TIMEOUT => config('chapaar.timeout'),
+            RequestOptions::CONNECT_TIMEOUT => config('chapaar.connect_timeout'),
         ]);
 
     }