[Bug] Capture curl errors when offline (alexjustesen#1826)

* capture curl errors when offline

* removed duplicate options method

Author: alexjustesen

app/Actions/GetExternalIpAddress.php

@@ -2,33 +2,28 @@
 
 namespace App\Actions;
 
-use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
 use Lorisleiva\Actions\Concerns\AsAction;
+use Throwable;
 
 class GetExternalIpAddress
 {
     use AsAction;
 
     public function handle(): bool|string
     {
-        $externalIp = Cache::remember('external_ip', 30, function (): bool|string {
+        try {
             $response = Http::retry(3, 100)
-                ->get('https://icanhazip.com/');
+                ->timeout(5)
+                ->get(url: 'https://icanhazip.com/');
+        } catch (Throwable $e) {
+            Log::error('Failed to fetch external IP address.', [$e->getMessage()]);
 
-            if ($response->failed()) {
-                $message = sprintf('Failed to fetch external IP address, %d', $response->status());
+            return false;
+        }
 
-                Log::warning($message);
-
-                return false;
-            }
-
-            return Str::trim($response->body());
-        });
-
-        return $externalIp;
+        return Str::trim($response->body());
     }
 }

app/Actions/GetOoklaSpeedtestServers.php

@@ -2,11 +2,10 @@
 
 namespace App\Actions;
 
-use Illuminate\Http\Client\RequestException;
-use Illuminate\Http\Client\Response;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
 use Lorisleiva\Actions\Concerns\AsAction;
+use Throwable;
 
 class GetOoklaSpeedtestServers
 {
@@ -20,19 +19,19 @@ public function handle(): array
             'limit' => 20,
         ];
 
-        $response = Http::retry(3, 250)
-            ->timeout(5)
-            ->get(url: 'https://www.speedtest.net/api/js/servers', query: $query)
-            ->throw(function (Response $response, RequestException $e) {
-                Log::error($e);
+        try {
+            $response = Http::retry(3, 250)
+                ->timeout(5)
+                ->get(url: 'https://www.speedtest.net/api/js/servers', query: $query);
+        } catch (Throwable $e) {
+            Log::error('Unable to retrieve Ookla servers.', [$e->getMessage()]);
 
-                return [
-                    '0' => 'There was an issue retrieving Ookla speedtest servers, check the logs for more info.',
-                ];
-            })
-            ->collect();
+            return [
+                '⚠️ Unable to retrieve Ookla servers, check internet connection and see logs.',
+            ];
+        }
 
-        return $response->mapWithKeys(function (array $item, int $key) {
+        return $response->collect()->mapWithKeys(function (array $item, int $key) {
             return [
                 $item['id'] => $item['sponsor'].' ('.$item['name'].', '.$item['id'].')',
             ];

app/Filament/Pages/Dashboard.php

@@ -57,7 +57,6 @@ protected function getHeaderActions(): array
                     Forms\Components\Select::make('server_id')
                         ->label('Select Server')
                         ->helperText('Leave empty to run the speedtest without specifying a server.')
-                        ->options(fn (): array => GetOoklaSpeedtestServers::run())
                         ->options(function (): array {
                             return array_filter([
                                 'Manual servers' => Ookla::getConfigServers(),