update and fix palworld query type schema

Author: Boy132

player-counter/README.md

@@ -4,10 +4,16 @@ Show the amount of connected players to game servers with real-time querying cap
 
 ## Setup
 
-Make sure your server has an allocation with a public ip. Alternatively, if you use local ips you can put the public ip in the allocation alias and enable "Use allocation alias?" in the plugin settings. (Using a domain as allocation alias or `0.0.0.0`/`::` as allocation ip will not work!)
+Make sure your server has an allocation with a public ip. Alternatively, if you use local ips you can put the public ip in the allocation alias and enable "Use allocation alias?" in the plugin settings. Using a domain as allocation alias or `0.0.0.0`/`::` as allocation ip will not work!
+
+### Minecraft
 
 Minecraft servers will first try the query (which requires you to set `enable-query` to true and `query-port` to your server port in `server.properties`) and will fallback to ping. It is recommended to enable query.
 
+### Palworld
+
+For Palworld servers you need to set `RESTAPIEnabled` to `true` and `RESTAPIPort` to your server port in `PalWorldSettings.ini`. You also need to set an admin password via the `ADMIN_PASSWORD` startup variable.
+
 ## Features
 
 - Real-time player count display for game servers

player-counter/src/Extensions/Query/Schemas/PalworldQueryTypeSchema.php

@@ -30,30 +30,24 @@ public function process(Server $server, string $ip, int $port): ?array
         }
 
         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"),
-            ]);
+            $http = Http::acceptJson()
+                ->timeout(5)
+                ->withBasicAuth('admin', $adminPassword)
+                ->throw()
+                ->baseUrl("http://{$ip}:{$port}");
 
-            if (!$playersResp->ok()) {
-                return null;
-            }
+            $info = $http->get('v1/api/info')->json();
+            $metrics = $http->get('v1/api/metrics')->json();
+            $players = $http->get('v1/api/players')->json();
 
-            $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;
+            $players = $players['players'] ?? [];
 
             return [
-                'hostname' => $server->name,
+                'hostname' => $info['servername'],
                 'map' => 'Palpagos Islands',
-                'current_players' => count($players),
-                'max_players' => $maxPlayers,
-                'players' => $players,
+                'current_players' => $metrics['currentplayernum'],
+                'max_players' => $metrics['maxplayernum'],
+                'players' => array_map(fn ($player) => ['id' => (string) ($player['playerId'] ?? $player['userId']), 'name' => (string) $player['name']], $players),
             ];
 
         } catch (Exception $exception) {