Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 26 additions & 3 deletions app/Actions/GetOoklaSpeedtestServers.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,14 @@ public function handle(): array
/**
* Fetch the raw Ookla server array from the Ookla API.
*/
public static function fetch(): array
public static function fetch(?string $search = null): array
{
$query = [
$query = array_filter([
'engine' => 'js',
'https_functional' => true,
'limit' => 20,
];
'search' => $search,
]);

try {
$response = Http::retry(3, 250)
Expand All @@ -58,6 +59,28 @@ public static function fetch(): array
}
}

/**
* For UI search: return the ID, Sponsor, and Name matching the query.
*/
public static function search(string $query): array
{
if (strlen($query) < 3) {
return [];
}

$servers = self::fetch($query);

if (empty($servers) || ! is_array($servers) || (isset($servers[0]) && ! is_array($servers[0]))) {
return [];
}

return collect($servers)->mapWithKeys(function (array $item) {
return [
$item['id'] => ($item['sponsor'] ?? 'Unknown').' ('.($item['name'] ?? 'Unknown').', '.$item['id'].')',
];
})->toArray();
}

/**
* For API: return array of structured server objects
*/
Expand Down
2 changes: 2 additions & 0 deletions app/Livewire/Topbar/Actions.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ public function speedtestAction(): Action
__('results.closest_servers') => GetOoklaSpeedtestServers::run(),
]);
})
->getSearchResultsUsing(fn (string $search): array => GetOoklaSpeedtestServers::search($search))
->getOptionLabelUsing(fn (int|string $value): string => (string) $value)
->searchable(),
])
->action(function (array $data) {
Expand Down
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"filament/filament": "^5.2",
"filament/spatie-laravel-settings-plugin": "^5.2",
"influxdata/influxdb-client-php": "^3.8",
"laravel-notification-channels/telegram": "^6.0",
"laravel/framework": "^12.50.0",
"laravel/prompts": "^0.3.11",
"laravel/sanctum": "^4.3.0",
Expand Down
2 changes: 1 addition & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lang/en/results.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
// Run Speedtest Action
'speedtest' => 'Speedtest',
'select_server' => 'Select Server',
'select_server_helper' => 'Leave empty to run the speedtest without specifying a server. Blocked servers will be skipped.',
'select_server_helper' => 'Leave empty to run the speedtest without specifying a server. Type to search for a server by name or location. Blocked servers will be skipped.',
'manual_servers' => 'Manual servers',
'closest_servers' => 'Closest servers',
'run_speedtest' => 'Run Speedtest',
Expand Down
91 changes: 91 additions & 0 deletions tests/Feature/GetOoklaSpeedtestServersTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
<?php

use App\Actions\GetOoklaSpeedtestServers;
use Illuminate\Support\Facades\Http;

describe('GetOoklaSpeedtestServers', function () {
describe('search', function () {
test('returns empty array when query is shorter than 3 characters', function () {
Http::fake();

$result = GetOoklaSpeedtestServers::search('ab');

expect($result)->toBe([]);
Http::assertNothingSent();
});

test('returns formatted servers matching the search query', function () {
Http::fake([
'www.speedtest.net/api/js/servers*' => Http::response([
['id' => 12345, 'sponsor' => 'Acme ISP', 'name' => 'London', 'host' => 'acme.example.com', 'country' => 'UK'],
['id' => 67890, 'sponsor' => 'BetaNet', 'name' => 'Manchester', 'host' => 'beta.example.com', 'country' => 'UK'],
]),
]);

$result = GetOoklaSpeedtestServers::search('London');

expect($result)->toBe([
12345 => 'Acme ISP (London, 12345)',
67890 => 'BetaNet (Manchester, 67890)',
]);
});

test('sends the search term to the Ookla API', function () {
Http::fake([
'www.speedtest.net/api/js/servers*' => Http::response([]),
]);

GetOoklaSpeedtestServers::search('Paris');

Http::assertSent(function ($request) {
return str_contains($request->url(), 'search=Paris');
});
});

test('returns empty array when API response is not a list of servers', function () {
Http::fake([
'www.speedtest.net/api/js/servers*' => Http::response(['⚠️ error message']),
]);

$result = GetOoklaSpeedtestServers::search('London');

expect($result)->toBe([]);
});

test('returns empty array when API returns empty list', function () {
Http::fake([
'www.speedtest.net/api/js/servers*' => Http::response([]),
]);

$result = GetOoklaSpeedtestServers::search('Nowhere');

expect($result)->toBe([]);
});
});

describe('fetch', function () {
test('passes search parameter to API when provided', function () {
Http::fake([
'www.speedtest.net/api/js/servers*' => Http::response([]),
]);

GetOoklaSpeedtestServers::fetch('Berlin');

Http::assertSent(function ($request) {
return str_contains($request->url(), 'search=Berlin');
});
});

test('does not pass search parameter when null', function () {
Http::fake([
'www.speedtest.net/api/js/servers*' => Http::response([]),
]);

GetOoklaSpeedtestServers::fetch();

Http::assertSent(function ($request) {
return ! str_contains($request->url(), 'search=');
});
});
});
});
Loading