Skip to content
Merged
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
Expand Up @@ -2,12 +2,14 @@

namespace Boy132\PlayerCounter\Extensions\Query;

use App\Models\Server;

interface QueryTypeSchemaInterface
{
public function getId(): string;

public function getName(): string;

/** @return ?array{hostname: string, map: string, current_players: int, max_players: int, players: ?array<array{id: string, name: string}>} */
public function process(string $ip, int $port): ?array;
public function process(Server $server, string $ip, int $port): ?array;
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Boy132\PlayerCounter\Extensions\Query\Schemas;

use App\Models\Server;
use Boy132\PlayerCounter\Extensions\Query\QueryTypeSchemaInterface;
use Exception;
use Illuminate\Support\Facades\Http;
Expand All @@ -19,7 +20,7 @@ public function getName(): string
}

/** @return ?array{hostname: string, map: string, current_players: int, max_players: int, players: array<array{id: string, name: string}>} */
public function process(string $ip, int $port): ?array
public function process(Server $server, string $ip, int $port): ?array
{
try {
$this->resolveSRV($ip, $port);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Boy132\PlayerCounter\Extensions\Query\Schemas;

use App\Models\Server;
use xPaw\SourceQuery\SourceQuery;

class GoldSourceQueryTypeSchema extends SourceQueryTypeSchema
Expand All @@ -17,7 +18,7 @@ public function getName(): string
}

/** @return ?array{hostname: string, map: string, current_players: int, max_players: int, players: array<array{id: string, name: string}>} */
public function process(string $ip, int $port): ?array
public function process(Server $server, string $ip, int $port): ?array
{
return $this->run($ip, $port, SourceQuery::GOLDSOURCE);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Boy132\PlayerCounter\Extensions\Query\Schemas;

use App\Models\Server;
use Boy132\PlayerCounter\Extensions\Query\QueryTypeSchemaInterface;
use Exception;
use xPaw\MinecraftQuery;
Expand All @@ -19,7 +20,7 @@ public function getName(): string
}

/** @return ?array{hostname: string, map: string, current_players: int, max_players: int, players: ?array<array{id: string, name: string}>} */
public function process(string $ip, int $port): ?array
public function process(Server $server, string $ip, int $port): ?array
{
$query = new MinecraftQuery();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Boy132\PlayerCounter\Extensions\Query\Schemas;

use App\Models\Server;
use Boy132\PlayerCounter\Extensions\Query\QueryTypeSchemaInterface;
use Exception;
use xPaw\MinecraftPing;
Expand All @@ -20,7 +21,7 @@ public function getName(): string
}

/** @return ?array{hostname: string, map: string, current_players: int, max_players: int, players: array<array{id: string, name: string}>} */
public function process(string $ip, int $port): ?array
public function process(Server $server, string $ip, int $port): ?array
{
$query = $this->tryQuery($ip, $port);
if ($query) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<?php

namespace Boy132\PlayerCounter\Extensions\Query\Schemas;

use App\Models\Server;
use Boy132\PlayerCounter\Extensions\Query\QueryTypeSchemaInterface;
Comment thread
Boy132 marked this conversation as resolved.
use Exception;
use Illuminate\Support\Facades\Http;

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

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

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

if (!$adminPassword) {
return null;
}

try {
$base = "http://{$ip}:{$port}";
[$playersResp, $metricsResp] = Http::pool(fn ($pool) => [
$pool->timeout(5)->withBasicAuth('admin', $adminPassword)->get("{$base}/v1/api/players"),
$pool->timeout(5)->withBasicAuth('admin', $adminPassword)->get("{$base}/v1/api/metrics"),
]);

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

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

$maxPlayers = $metricsResp->ok() ? ($metricsResp->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 (Exception $exception) {
report($exception);

return null;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Boy132\PlayerCounter\Extensions\Query\Schemas;

use App\Models\Server;
use Boy132\PlayerCounter\Extensions\Query\QueryTypeSchemaInterface;
use Exception;
use xPaw\SourceQuery\SourceQuery;
Expand All @@ -19,7 +20,7 @@ public function getName(): string
}

/** @return ?array{hostname: string, map: string, current_players: int, max_players: int, players: array<array{id: string, name: string}>} */
public function process(string $ip, int $port): ?array
public function process(Server $server, string $ip, int $port): ?array
{
return $this->run($ip, $port, SourceQuery::SOURCE);
}
Expand Down
2 changes: 1 addition & 1 deletion player-counter/src/Models/GameQuery.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public function runQuery(Server $server): ?array
/** @var QueryTypeService $service */
$service = app(QueryTypeService::class);

return $service->get($this->query_type)?->process($ip, $port);
return $service->get($this->query_type)?->process($server, $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