Merge branch 'main' into feat/schedule-ui

Author: svenvg93

.devcontainer/devcontainer.json

@@ -1,8 +1,8 @@
 // https://aka.ms/devcontainer.json
 {
-	"name": "Existing Docker Compose (Extend)",
+	"name": "Speedtest Tracker Dev Environment",
 	"dockerComposeFile": [
-		"../docker-compose.yml"
+		"../compose.yaml"
 	],
 	"service": "laravel.test",
 	"workspaceFolder": "/var/www/html",
@@ -20,7 +20,7 @@
 		}
 	},
 	"remoteUser": "sail",
-	"postCreateCommand": "chown -R 1000:1000 /var/www/html 2>/dev/null || true"
+	"postCreateCommand": "composer install && npm install && npm run build && touch database/database.sqlite && php artisan migrate:fresh --force"
 	// "forwardPorts": [],
 	// "runServices": [],
 	// "shutdownAction": "none",

.env.example

@@ -18,6 +18,11 @@ LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 
 DB_CONNECTION=sqlite
+#DB_HOST=
+#DB_PORT=
+#DB_DATABASE=
+#DB_USERNAME=
+#DB_PASSWORD=
 
 SESSION_DRIVER=cookie
 SESSION_LIFETIME=10080
@@ -42,3 +47,7 @@ MAIL_FROM_ADDRESS="[email protected]"
 MAIL_FROM_NAME="Speedtest Tracker"
 
 VITE_APP_NAME="${APP_NAME}"
+
+# For the Dev Container
+# WWWUSER=1000
+# WWWGROUP=1000

app/Actions/Notifications/SendWebhookTestNotification.php

@@ -37,7 +37,7 @@ public function handle(array $webhooks)
                     'ping' => $fakeResult->ping,
                     'download' => $fakeResult->download,
                     'upload' => $fakeResult->upload,
-                    'packetLoss' => $fakeResult->data['packetLoss'],
+                    'packet_loss' => $fakeResult->data['packetLoss'],
                     'speedtest_url' => $fakeResult->data['result']['url'],
                     'url' => url('/admin/results'),
                 ])

app/Jobs/Ookla/BenchmarkSpeedtestJob.php

@@ -7,6 +7,7 @@
 use App\Events\SpeedtestBenchmarking;
 use App\Events\SpeedtestBenchmarkUnhealthy;
 use App\Helpers\Benchmark;
+use App\Helpers\Number;
 use App\Models\Result;
 use App\Settings\ThresholdSettings;
 use Illuminate\Bus\Batchable;
@@ -83,7 +84,8 @@ private function benchmark(Result $result, ThresholdSettings $settings): array
                 'bar' => 'min',
                 'passed' => Benchmark::bitrate($result->download, ['value' => $settings->absolute_download, 'unit' => 'mbps']),
                 'type' => 'absolute',
-                'value' => $settings->absolute_download,
+                'test_value' => Number::bitsToMagnitude(bits: $result->download_bits, precision: 0, magnitude: 'mbit'),
+                'benchmark_value' => $settings->absolute_download,
                 'unit' => 'mbps',
             ]);
 
@@ -97,7 +99,8 @@ private function benchmark(Result $result, ThresholdSettings $settings): array
                 'bar' => 'min',
                 'passed' => filter_var(Benchmark::bitrate($result->upload, ['value' => $settings->absolute_upload, 'unit' => 'mbps']), FILTER_VALIDATE_BOOLEAN),
                 'type' => 'absolute',
-                'value' => $settings->absolute_upload,
+                'test_value' => Number::bitsToMagnitude(bits: $result->upload_bits, precision: 0, magnitude: 'mbit'),
+                'benchmark_value' => $settings->absolute_upload,
                 'unit' => 'mbps',
             ]);
 
@@ -111,7 +114,8 @@ private function benchmark(Result $result, ThresholdSettings $settings): array
                 'bar' => 'max',
                 'passed' => Benchmark::ping($result->ping, ['value' => $settings->absolute_ping]),
                 'type' => 'absolute',
-                'value' => $settings->absolute_ping,
+                'test_value' => round($result->ping),
+                'benchmark_value' => $settings->absolute_ping,
                 'unit' => 'ms',
             ]);
 

app/Listeners/ProcessCompletedSpeedtest.php

@@ -162,10 +162,11 @@ private function notifyWebhookChannels(Result $result): void
                     'site_name' => config('app.name'),
                     'server_name' => Arr::get($result->data, 'server.name'),
                     'server_id' => Arr::get($result->data, 'server.id'),
+                    'status' => $result->status,
                     'isp' => Arr::get($result->data, 'isp'),
-                    'ping' => $result->ping,
-                    'download' => $result->downloadBits,
-                    'upload' => $result->uploadBits,
+                    'ping' => round($result->ping),
+                    'download' => Number::bitsToMagnitude(bits: $result->download_bits, precision: 0, magnitude: 'mbit'),
+                    'upload' => Number::bitsToMagnitude(bits: $result->upload_bits, precision: 0, magnitude: 'mbit'),
                     'packet_loss' => Arr::get($result->data, 'packetLoss'),
                     'speedtest_url' => Arr::get($result->data, 'result.url'),
                     'url' => url('/admin/results'),

compose.yaml

@@ -25,7 +25,7 @@ services:
             - mailpit
             - apprise
     pgsql:
-        image: 'postgres:17-alpine'
+        image: 'postgres:18-alpine'
         ports:
             - '${FORWARD_DB_PORT:-5432}:5432'
         environment: