Merge pull request #4 from always-open/handle-nulls-bwt-results

Handle timeout error and nulls data

Author: qschmick

config/bwt-api.php

@@ -3,4 +3,5 @@
 return [
     'base_url' => env('BWT_API_BASE_URL', 'https://bwt.com/api'),
     'api_key' => env('BWT_API_KEY'),
+    'timeout' => env('BWT_API_TIMEOUT', 120),
 ];

src/BwtApiClient.php

@@ -20,12 +20,16 @@ class BwtApiClient
 
     protected ?string $apiKey = null;
 
+    protected int $timeout = 60;
+
     public function __construct(
         ?string $baseUrl = null,
         ?string $apiKey = null,
+        ?int $timeout = null,
     ) {
         $this->baseUrl = $baseUrl ?? config('bwt-api.base_url', 'https://bwt.com/api');
         $this->apiKey = $apiKey ?? config('bwt-api.api_key') ?? '';
+        $this->timeout = $timeout ?? config('bwt-api.timeout', 60);
     }
 
     protected function getAuthHeader(): array
@@ -54,9 +58,11 @@ protected function makeRequest(
         return retry($retryCount ?? 0, function () use ($request, $method, $payload): PromiseInterface|Response {
             if (strtolower($method) === 'post') {
                 return Http::withHeaders($request->getHeaders())
+                    ->timeout($this->timeout)
                     ->post($request->getUri(), $payload);
             } else {
                 return Http::withHeaders($request->getHeaders())
+                    ->timeout($this->timeout)
                     ->get($request->getUri());
             }
         }, 2000);

src/BwtApiServiceProvider.php

@@ -8,10 +8,13 @@ class BwtApiServiceProvider extends ServiceProvider
 {
     public function register()
     {
+        $this->mergeConfigFrom(__DIR__.'/../config/bwt-api.php', 'bwt-api');
+
         $this->app->singleton(BwtApiClient::class, function ($app) {
             return new BwtApiClient(
                 config('bwt-api.base_url'),
                 config('bwt-api.api_key'),
+                config('bwt-api.timeout'),
             );
         });
     }

src/DTOs/Amazon/AmazonResult.php

@@ -13,20 +13,20 @@ class AmazonResult extends Data
     public function __construct(
         public readonly int $id,
         public readonly int $scraping_mode,
-        public readonly string $requested_asin,
+        public readonly ?string $requested_asin,
         public readonly string|int|null $max_offers,
         public readonly string|int|null $max_offers_pages,
-        public readonly string $postal_code,
-        public readonly string $region,
-        public readonly string $title,
-        public readonly string $url,
-        public readonly string $scraped_asin,
-        public readonly string $description,
-        public readonly array $additional_details,
-        public readonly array $additional_information,
-        public readonly array $additional_technical_details,
+        public readonly ?string $postal_code,
+        public readonly ?string $region,
+        public readonly ?string $title,
+        public readonly ?string $url,
+        public readonly ?string $scraped_asin,
+        public readonly ?string $description,
+        public readonly ?array $additional_details,
+        public readonly ?array $additional_information,
+        public readonly ?array $additional_technical_details,
         public readonly ?string $manufacturer,
-        public readonly array $best_sellers_rank,
+        public readonly ?array $best_sellers_rank,
         public readonly ?array $category,
         public readonly string|int|null $variations,
         public readonly string|int|null $past_month_sales,
@@ -35,7 +35,7 @@ public function __construct(
         public readonly ?string $merchant_id,
         public readonly ?string $storefront_url,
         public readonly ?string $stock,
-        public readonly string $condition,
+        public readonly ?string $condition,
         public readonly string|int|float|null $price,
         public readonly string|int|float|null $sale_price,
         public readonly ?string $coupon,