[Bug] Separate CheckInternetConnection from GetExternalIpAddress (alexjustesen#2120)

Author: svenvg93

app/Actions/CheckInternetConnection.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Actions;
+
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Str;
+use Lorisleiva\Actions\Concerns\AsAction;
+use Throwable;
+
+class CheckInternetConnection
+{
+    use AsAction;
+
+    public function handle(): bool|string
+    {
+        try {
+            $response = Http::retry(3, 100)
+                ->timeout(5)
+                ->get(config('speedtest.checkinternet_url'));
+
+            if (! $response->ok()) {
+                return false;
+            }
+
+            return Str::trim($response->body());
+        } catch (Throwable $e) {
+            Log::error('Failed to check internet connection.', [$e->getMessage()]);
+
+            return false;
+        }
+    }
+}

app/Jobs/CheckForInternetConnectionJob.php

@@ -2,7 +2,7 @@
 
 namespace App\Jobs;
 
-use App\Actions\GetExternalIpAddress;
+use App\Actions\CheckInternetConnection;
 use App\Enums\ResultStatus;
 use App\Events\SpeedtestChecking;
 use App\Events\SpeedtestFailed;
@@ -44,7 +44,7 @@ public function handle(): void
 
         SpeedtestChecking::dispatch($this->result);
 
-        if (GetExternalIpAddress::run() !== false) {
+        if (CheckInternetConnection::run() !== false) {
             return;
         }
 

config/speedtest.php

@@ -28,6 +28,8 @@
 
     'interface' => env('SPEEDTEST_INTERFACE'),
 
+    'checkinternet_url' => env('SPEEDTEST_CHECKINTERNET_URL', 'https://icanhazip.com'),
+
     /**
      * IP filtering settings.
      */