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
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
<?php

namespace Boy132\PlayerCounter\Extensions\Query\Schemas;

use App\Models\Server;
use Boy132\PlayerCounter\Extensions\Query\ServerAwareQueryTypeSchemaInterface;
use Illuminate\Support\Facades\Http;

class PalworldQueryTypeSchema implements ServerAwareQueryTypeSchemaInterface
{
public function getId(): string
{
return 'palworld';
}

public function getName(): string
{
return 'Palworld';
}

// Fallback: no auth context available — cannot query REST API
public function process(string $ip, int $port): ?array
{
return null;
}

public function processWithServer(Server $server, string $ip, int $port): ?array
{
$adminPassword = $server->variables()
->where('env_variable', 'ADMIN_PASSWORD')
->first()?->server_value;

if (!$adminPassword) {
return null;
}

try {
$response = Http::timeout(5)
->withBasicAuth('admin', $adminPassword)
->get("http://{$ip}:{$port}/v1/api/players");

if (!$response->ok()) {
return null;
}

$data = $response->json();
$players = array_map(fn ($p) => [
'id' => $p['playeruid'] ?? $p['steamid'] ?? '',
'name' => $p['name'] ?? '',
], $data['players'] ?? []);

// Fetch metrics for max_players
$metricsResponse = Http::timeout(5)
->withBasicAuth('admin', $adminPassword)
->get("http://{$ip}:{$port}/v1/api/metrics");

$maxPlayers = $metricsResponse->ok() ? ($metricsResponse->json()['maxplayernum'] ?? 32) : 32;

return [
'hostname' => $server->name,
'map' => 'Palpagos Islands',
'current_players' => count($players),
'max_players' => $maxPlayers,
'players' => $players,
];
Comment thread
coderabbitai[bot] marked this conversation as resolved.
} catch (\Throwable $e) {
report($e);

return null;
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

namespace Boy132\PlayerCounter\Extensions\Query;

use App\Models\Server;

interface ServerAwareQueryTypeSchemaInterface extends QueryTypeSchemaInterface
{
/** @return ?array{hostname: string, map: string, current_players: int, max_players: int, players: ?array<array{id: string, name: string}>} */
public function processWithServer(Server $server, string $ip, int $port): ?array;
}
8 changes: 7 additions & 1 deletion player-counter/src/Models/GameQuery.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
use App\Models\Egg;
use App\Models\Server;
use Boy132\PlayerCounter\Extensions\Query\QueryTypeService;
use Boy132\PlayerCounter\Extensions\Query\ServerAwareQueryTypeSchemaInterface;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
Expand Down Expand Up @@ -59,7 +60,12 @@ public function runQuery(Server $server): ?array
/** @var QueryTypeService $service */
$service = app(QueryTypeService::class);

return $service->get($this->query_type)?->process($ip, $port);
$schema = $service->get($this->query_type);
if ($schema instanceof ServerAwareQueryTypeSchemaInterface) {
return $schema->processWithServer($server, $ip, $port);
}

return $schema?->process($ip, $port);
}

public static function canRunQuery(?Allocation $allocation): bool
Expand Down
2 changes: 2 additions & 0 deletions player-counter/src/Providers/PlayerCounterPluginProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use Boy132\PlayerCounter\Extensions\Query\Schemas\GoldSourceQueryTypeSchema;
use Boy132\PlayerCounter\Extensions\Query\Schemas\MinecraftBedrockQueryTypeSchema;
use Boy132\PlayerCounter\Extensions\Query\Schemas\MinecraftJavaQueryTypeSchema;
use Boy132\PlayerCounter\Extensions\Query\Schemas\PalworldQueryTypeSchema;
use Boy132\PlayerCounter\Extensions\Query\Schemas\SourceQueryTypeSchema;
use Boy132\PlayerCounter\Filament\Server\Widgets\ServerPlayerWidget;
use Boy132\PlayerCounter\Models\EggGameQuery;
Expand All @@ -35,6 +36,7 @@ public function register(): void
$service->register(new MinecraftJavaQueryTypeSchema());
$service->register(new MinecraftBedrockQueryTypeSchema());
$service->register(new CitizenFXQueryTypeSchema());
$service->register(new PalworldQueryTypeSchema());

return $service;
});
Expand Down