[Chore] Consolidate Results, Speedtest & Stats API Endpoints into Dedicated Controllers (#2225)

Co-authored-by: Alex Justesen <alexjustesen@users.noreply.github.com>

Author: svenvg93

app/Actions/GetOoklaSpeedtestServers.php

@@ -2,6 +2,7 @@
 
 namespace App\Actions;
 
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
 use Lorisleiva\Actions\Concerns\AsAction;
@@ -11,7 +12,22 @@ class GetOoklaSpeedtestServers
 {
     use AsAction;
 
+    /**
+     * For UI: return the ID, Sponsor, and Name to start a manual test
+     */
     public function handle(): array
+    {
+        return collect(self::fetch())->mapWithKeys(function (array $item) {
+            return [
+                $item['id'] => ($item['sponsor'] ?? 'Unknown').' ('.($item['name'] ?? 'Unknown').', '.$item['id'].')',
+            ];
+        })->toArray();
+    }
+
+    /**
+     * Fetch the raw Ookla server array from the Ookla API.
+     */
+    public static function fetch(): array
     {
         $query = [
             'engine' => 'js',
@@ -23,17 +39,37 @@ public function handle(): array
             $response = Http::retry(3, 250)
                 ->timeout(5)
                 ->get(url: 'https://www.speedtest.net/api/js/servers', query: $query);
+
+            return $response->json();
         } catch (Throwable $e) {
             Log::error('Unable to retrieve Ookla servers.', [$e->getMessage()]);
 
             return [
                 '⚠️ Unable to retrieve Ookla servers, check internet connection and see logs.',
             ];
         }
+    }
+
+    /**
+     * For API: return array of structured server objects
+     */
+    public static function forApi(): array
+    {
+        $servers = self::fetch();
+
+        // If the first item is not an array, treat as error or empty
+        if (empty($servers) || ! is_array($servers) || (isset($servers[0]) && ! is_array($servers[0]))) {
+            // Optionally, you could return an error message here, but to match the controller's behavior, return an empty array
+            return [];
+        }
 
-        return $response->collect()->mapWithKeys(function (array $item, int $key) {
+        return collect($servers)->map(function (array $item) {
             return [
-                $item['id'] => $item['sponsor'].' ('.$item['name'].', '.$item['id'].')',
+                'id' => $item['id'],
+                'host' => Arr::get($item, 'host', 'Unknown'),
+                'name' => Arr::get($item, 'sponsor', 'Unknown'),
+                'location' => Arr::get($item, 'name', 'Unknown'),
+                'country' => Arr::get($item, 'country', 'Unknown'),
             ];
         })->toArray();
     }

app/Filament/Resources/ApiTokenResource.php

@@ -53,9 +53,9 @@ public static function getTokenFormSchema(): array
                         ->required()
                         ->bulkToggleable()
                         ->descriptions([
-                            'results:read' => 'Allow this token to read results.',
-                            'speedtests:run' => 'Allow this token to run speedtests.',
-                            'ookla:list-servers' => 'Allow this token to list servers.',
+                            'results:read' => 'Grant this token permission to read results and statistics.',
+                            'speedtests:run' => 'Grant this token permission to run speedtests.',
+                            'ookla:list-servers' => 'Grant this token permission to list available servers.',
                         ]),
                     DateTimePicker::make('expires_at')
                         ->label('Expires at')

app/Http/Controllers/Api/V1/LatestResult.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Controllers\Api\V1;
+
+use App\Actions\GetOoklaSpeedtestServers;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+
+class OoklaController extends ApiController
+{
+    /**
+     * GET /api/v1/ookla/list-servers
+     * List available Ookla speedtest servers.
+     */
+    public function __invoke(Request $request)
+    {
+        if ($request->user()->tokenCant('ookla:list-servers')) {
+            return $this->sendResponse(
+                data: null,
+                message: 'You do not have permission to view speedtest servers.',
+                code: Response::HTTP_FORBIDDEN,
+            );
+        }
+
+        $servers = GetOoklaSpeedtestServers::forApi();
+
+        return $this->sendResponse(
+            data: $servers,
+            message: 'Speedtest servers fetched successfully.'
+        );
+    }
+}