Merge branch 'main' into feat/schedule-ui

Author: svenvg93

app/Actions/CheckInternetConnection.php

@@ -12,18 +12,28 @@ class GetExternalIpAddress
 {
     use AsAction;
 
-    public function handle(): bool|string
+    public function handle(?string $url = null): array
     {
+        $url = $url ?? config('speedtest.preflight.external_ip_url');
+
         try {
             $response = Http::retry(3, 100)
                 ->timeout(5)
-                ->get(url: 'https://icanhazip.com/');
+                ->get(url: $url);
         } catch (Throwable $e) {
-            Log::error('Failed to fetch external IP address.', [$e->getMessage()]);
+            $message = sprintf('Failed to fetch external IP address from "%s". See the logs for more details.', $url);
+
+            Log::error($message, [$e->getMessage()]);
 
-            return false;
+            return [
+                'ok' => false,
+                'body' => $message,
+            ];
         }
 
-        return Str::trim($response->body());
+        return [
+            'ok' => $response->ok(),
+            'body' => Str::of($response->body())->trim()->toString(),
+        ];
     }
 }

app/Actions/GetExternalIpAddress.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Actions;
+
+use Illuminate\Support\Facades\Log;
+use Lorisleiva\Actions\Concerns\AsAction;
+use Spatie\Ping\Ping;
+use Spatie\Ping\PingResult;
+
+class PingHostname
+{
+    use AsAction;
+
+    public function handle(?string $hostname = null, int $count = 1): PingResult
+    {
+        $hostname = $hostname ?? config('speedtest.preflight.internet_check_hostname');
+
+        // Remove protocol if present
+        $hostname = preg_replace('#^https?://#', '', $hostname);
+
+        $ping = (new Ping(
+            hostname: $hostname,
+            count: $count,
+        ))->run();
+
+        Log::info('Pinged hostname', [
+            'host' => $hostname,
+            'data' => $ping->toArray(),
+        ]);
+
+        return $ping;
+    }
+}

app/Actions/PingHostname.php

@@ -2,7 +2,7 @@
 
 namespace App\Jobs;
 
-use App\Actions\CheckInternetConnection;
+use App\Actions\PingHostname;
 use App\Enums\ResultStatus;
 use App\Events\SpeedtestChecking;
 use App\Events\SpeedtestFailed;
@@ -44,14 +44,18 @@ public function handle(): void
 
         SpeedtestChecking::dispatch($this->result);
 
-        if (CheckInternetConnection::run() !== false) {
+        $ping = PingHostname::run();
+
+        if ($ping->isSuccess()) {
             return;
         }
 
+        $message = sprintf('Failed to connected to hostname "%s". Error received "%s".', $ping->getHost(), $ping->error()?->value);
+
         $this->result->update([
             'data->type' => 'log',
             'data->level' => 'error',
-            'data->message' => 'Failed to connect to the internet.',
+            'data->message' => $message,
             'status' => ResultStatus::Failed,
         ]);
 

app/Jobs/CheckForInternetConnectionJob.php

@@ -60,6 +60,7 @@ public function handle(): void
             'speedtest',
             '--accept-license',
             '--accept-gdpr',
+            '--selection-details',
             '--format=json',
             $this->result->server_id ? '--server-id='.$this->result->server_id : null,
             config('speedtest.interface') ? '--interface='.config('speedtest.interface') : null,

app/Jobs/Ookla/RunSpeedtestJob.php

@@ -4,6 +4,7 @@
 
 use App\Actions\GetExternalIpAddress;
 use App\Enums\ResultStatus;
+use App\Events\SpeedtestFailed;
 use App\Events\SpeedtestSkipped;
 use App\Helpers\Network;
 use App\Models\Result;
@@ -47,8 +48,23 @@ public function handle(): void
 
         $externalIp = GetExternalIpAddress::run();
 
+        if ($externalIp['ok'] === false) {
+            $this->result->update([
+                'data->type' => 'log',
+                'data->level' => 'error',
+                'data->message' => $externalIp['body'],
+                'status' => ResultStatus::Failed,
+            ]);
+
+            SpeedtestFailed::dispatch($this->result);
+
+            $this->batch()->cancel();
+
+            return;
+        }
+
         $shouldSkip = $this->shouldSkip(
-            externalIp: $externalIp,
+            externalIp: $externalIp['body'],
         );
 
         if ($shouldSkip === false) {
@@ -76,11 +92,11 @@ private function shouldSkip(string $externalIp): bool|string
         $skipIPs = array_filter(
             array_map(
                 'trim',
-                explode(',', config('speedtest.skip_ips')),
+                explode(',', config('speedtest.preflight.skip_ips')),
             ),
         );
 
-        if (count($skipIPs) < 1) {
+        if (empty($skipIPs)) {
             return false;
         }
 

app/Jobs/Ookla/SkipSpeedtestJob.php

@@ -20,7 +20,6 @@
         "dragonmantank/cron-expression": "^3.6.0",
         "filament/filament": "4.1.0",
         "filament/spatie-laravel-settings-plugin": "^4.1",
-        "geerlingguy/ping": "^1.2.1",
         "influxdata/influxdb-client-php": "^3.8",
         "laravel-notification-channels/telegram": "^6.0",
         "laravel/framework": "^12.41.1",
@@ -37,6 +36,7 @@
         "spatie/laravel-query-builder": "^6.3.6",
         "spatie/laravel-settings": "^3.6.0",
         "spatie/laravel-webhook-server": "^3.8.3",
+        "spatie/ping": "^1.1.1",
         "zircote/swagger-php": "^5.7.6"
     },
     "require-dev": {

composer.json

@@ -6,9 +6,9 @@
     /**
      * General settings.
      */
-    'build_date' => Carbon::parse('2025-12-15'),
+    'build_date' => Carbon::parse('2025-12-16'),
 
-    'build_version' => 'v1.12.4',
+    'build_version' => 'v1.13.0',
 
     'content_width' => env('CONTENT_WIDTH', '7xl'),
 
@@ -29,15 +29,17 @@
 
     'interface' => env('SPEEDTEST_INTERFACE'),
 
-    'checkinternet_url' => env('SPEEDTEST_CHECKINTERNET_URL', 'https://icanhazip.com'),
+    'preflight' => [
+        'external_ip_url' => env('SPEEDTEST_CHECKINTERNET_URL') ?? env('SPEEDTEST_EXTERNAL_IP_URL', 'https://icanhazip.com'),
+        'internet_check_hostname' => env('SPEEDTEST_CHECKINTERNET_URL') ?? env('SPEEDTEST_INTERNET_CHECK_HOSTNAME', 'icanhazip.com'),
+        'skip_ips' => env('SPEEDTEST_SKIP_IPS'),
+    ],
 
     /**
      * IP filtering settings.
      */
     'allowed_ips' => env('ALLOWED_IPS'),
 
-    'skip_ips' => env('SPEEDTEST_SKIP_IPS', ''),
-
     /**
      * Threshold settings.
      */

composer.lock

@@ -11,6 +11,7 @@
                 class="col-span-1"
                 icon="tabler-book"
                 icon-size="md"
+                :compact="true"
             >
                 <x-slot name="heading">
                     {{ __('general.documentation') }}
@@ -35,6 +36,7 @@ class="col-span-1"
                 class="col-span-1"
                 icon="tabler-cash-banknote-heart"
                 icon-size="md"
+                :compact="true"
             >
                 <x-slot name="heading">
                     {{ __('general.donations') }}
@@ -59,6 +61,7 @@ class="col-span-1"
                 class="col-span-1"
                 icon="tabler-brand-github"
                 icon-size="md"
+                :compact="true"
             >
                 <x-slot name="heading">
                     {{ __('general.speedtest_tracker') }}