Merge branch 'main' into feature/2146-implement-a-data-cap

Author: alexjustesen

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

@@ -3,15 +3,17 @@
 namespace App\Actions\Notifications;
 
 use App\Notifications\Apprise\TestNotification;
+use App\Settings\NotificationSettings;
 use Filament\Notifications\Notification;
 use Illuminate\Support\Facades\Notification as FacadesNotification;
 use Lorisleiva\Actions\Concerns\AsAction;
+use Throwable;
 
 class SendAppriseTestNotification
 {
     use AsAction;
 
-    public function handle(array $channel_urls)
+    public function handle(array $channel_urls): void
     {
         if (! count($channel_urls)) {
             Notification::make()
@@ -22,24 +24,77 @@ public function handle(array $channel_urls)
             return;
         }
 
-        foreach ($channel_urls as $row) {
-            $channelUrl = $row['channel_url'] ?? null;
-            if (! $channelUrl) {
-                Notification::make()
-                    ->title('Skipping missing channel URL!')
-                    ->warning()
-                    ->send();
+        $settings = app(NotificationSettings::class);
+        $appriseUrl = rtrim($settings->apprise_server_url ?? '', '/');
 
-                continue;
+        if (empty($appriseUrl)) {
+            Notification::make()
+                ->title('Apprise Server URL is not configured')
+                ->body('Please configure the Apprise Server URL in the settings above.')
+                ->danger()
+                ->send();
+
+            return;
+        }
+
+        try {
+            foreach ($channel_urls as $row) {
+                $channelUrl = $row['channel_url'] ?? null;
+                if (! $channelUrl) {
+                    continue;
+                }
+
+                // Use notifyNow() to send synchronously even though notification implements ShouldQueue
+                // This allows us to catch exceptions and show them in the UI immediately
+                FacadesNotification::route('apprise_urls', $channelUrl)
+                    ->notifyNow(new TestNotification);
             }
+        } catch (Throwable $e) {
+            $errorMessage = $this->cleanErrorMessage($e);
+
+            Notification::make()
+                ->title('Failed to send Apprise test notification')
+                ->body($errorMessage)
+                ->danger()
+                ->send();
 
-            FacadesNotification::route('apprise_urls', $channelUrl)
-                ->notify(new TestNotification);
+            return;
         }
 
         Notification::make()
             ->title('Test Apprise notification sent.')
             ->success()
             ->send();
     }
+
+    /**
+     * Clean up error message for display in UI.
+     */
+    protected function cleanErrorMessage(Throwable $e): string
+    {
+        $message = $e->getMessage();
+
+        // Get the full Apprise server URL for error messages
+        $settings = app(NotificationSettings::class);
+        $appriseUrl = rtrim($settings->apprise_server_url ?? '', '/');
+
+        // Handle connection errors - extract just the important part
+        if (str_contains($message, 'cURL error')) {
+            if (str_contains($message, 'Could not resolve host')) {
+                return "Could not connect to Apprise server at {$appriseUrl}";
+            }
+
+            if (str_contains($message, 'Connection refused')) {
+                return "Connection refused by Apprise server at {$appriseUrl}";
+            }
+
+            if (str_contains($message, 'Operation timed out')) {
+                return "Connection to Apprise server at {$appriseUrl} timed out";
+            }
+
+            return "Failed to connect to Apprise server at {$appriseUrl}";
+        }
+
+        return $message;
+    }
 }

app/Actions/Notifications/SendAppriseTestNotification.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

@@ -6,7 +6,7 @@
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
-class SpeedtestBenchmarkFailed
+class SpeedtestBenchmarkHealthy
 {
     use Dispatchable, SerializesModels;
 

app/Events/SpeedtestBenchmarkFailed.php app/Events/SpeedtestBenchmarkHealthy.phpapp/Events/SpeedtestBenchmarkFailed.php renamed to app/Events/SpeedtestBenchmarkHealthy.php

@@ -6,7 +6,7 @@
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
-class SpeedtestBenchmarkPassed
+class SpeedtestBenchmarkUnhealthy
 {
     use Dispatchable, SerializesModels;
 

app/Events/SpeedtestBenchmarkPassed.php …p/Events/SpeedtestBenchmarkUnhealthy.phpapp/Events/SpeedtestBenchmarkPassed.php renamed to app/Events/SpeedtestBenchmarkUnhealthy.php app/Events/SpeedtestBenchmarkPassed.php renamed to app/Events/SpeedtestBenchmarkUnhealthy.php

@@ -14,6 +14,7 @@
 use App\Actions\Notifications\SendTelegramTestNotification;
 use App\Actions\Notifications\SendWebhookTestNotification;
 use App\Rules\AppriseScheme;
+use App\Rules\ContainsString;
 use App\Settings\NotificationSettings;
 use CodeWithDennis\SimpleAlert\Components\SimpleAlert;
 use Filament\Actions\Action;
@@ -233,10 +234,12 @@ public function form(Schema $schema): Schema
                                             ->schema([
                                                 TextInput::make('apprise_server_url')
                                                     ->label(__('settings/notifications.apprise_server_url'))
-                                                    ->placeholder('http://localhost:8000')
+                                                    ->placeholder('http://localhost:8000/notify')
+                                                    ->helperText(__('settings/notifications.apprise_server_url_helper'))
                                                     ->maxLength(2000)
                                                     ->required()
                                                     ->url()
+                                                    ->rule(new ContainsString('/notify'))
                                                     ->columnSpanFull(),
                                                 Checkbox::make('apprise_verify_ssl')
                                                     ->label(__('settings/notifications.apprise_verify_ssl'))

app/Filament/Pages/Settings/Notification.php

@@ -7,9 +7,9 @@
 use Filament\Forms\Components\Textarea;
 use Filament\Forms\Concerns\InteractsWithForms;
 use Filament\Forms\Contracts\HasForms;
-use Filament\Forms\Form;
 use Filament\Notifications\Notification;
 use Filament\Pages\Page;
+use Filament\Schemas\Schema;
 
 class ListOoklaServers extends Page implements HasForms
 {
@@ -69,10 +69,10 @@ public function fetchServers(): void
         }
     }
 
-    public function form(Form $form): Form
+    public function form(Schema $schema): Schema
     {
-        return $form
-            ->schema([
+        return $schema
+            ->components([
                 Textarea::make('servers')
                     ->label(false)
                     ->rows(20)