Added support for Counter-Strike 2. Fixed support for FiveM and Rust

README.md

@@ -1,6 +1,6 @@
 # 📊 Game Server Query
 
-Current version: **1.0.23**
+Current version: **1.0.24**
 
 ### [Inspiration: GameQ by AustinB](https://github.com/Austinb/GameQ)
 

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "gasjki/game-server-query",
   "description": "GameServerQuery - Extended PHP game server query library based on GameQ.",
-  "version": "1.0.23",
+  "version": "1.0.24",
   "type": "library",
   "license": "LGPL-3.0+",
   "keywords": [

src/GameServerQuery/Protocol/Games/Source/CounterStrike2Protocol.php

@@ -0,0 +1,14 @@
+<?php declare(strict_types = 1);
+
+namespace GameServerQuery\Protocol\Games\Source;
+
+use GameServerQuery\Protocol\Types\SourceProtocol;
+
+/**
+ * Class CounterStrike2Protocol
+ * @package GameServerQuery\Protocol\Games\Source
+ */
+class CounterStrike2Protocol extends SourceProtocol
+{
+
+}

src/GameServerQuery/Protocol/Games/Source/RustProtocol.php

@@ -35,12 +35,16 @@ protected function processRules(Buffer $buffer, Result $result): void
     {
         parent::processRules($buffer, $result);
 
-        if ($keywords = $result->getRule('keywords')) {
-            //get max players from mp of keywords and num players from cp keyword
-            preg_match_all('/(mp|cp)(\d+)/', $keywords, $matches);
-
-            $result->addInformation(Result::GENERAL_SLOTS_SUBCATEGORY, (int) $matches[2][0]);
-            $result->addInformation(Result::GENERAL_ONLINE_PLAYERS_SUBCATEGORY, (int) $matches[2][1]);
+        if (!$result->hasRule('keywords')) {
+            return;
         }
+
+        $keywords = $result->getRule('keywords');
+
+        // Get max players from mp of keywords and num players from cp keyword.
+        preg_match_all('/(mp|cp)(\d+)/', $keywords, $matches);
+
+        $result->addInformation(Result::GENERAL_SLOTS_SUBCATEGORY, (int) $matches[2][0]);
+        $result->addInformation(Result::GENERAL_ONLINE_PLAYERS_SUBCATEGORY, (int) $matches[2][1]);
     }
 }

src/GameServerQuery/Query/Types/FiveMQuery.php

@@ -14,7 +14,6 @@ class FiveMQuery extends AbstractQuery
 {
     /**
      * @inheritDoc
-     * @throws \JsonException
      */
     public function execute(): array
     {
@@ -46,7 +45,6 @@ public function execute(): array
      * Read server's players.
      *
      * @return array
-     * @throws \JsonException
      */
     private function readServerPlayersUrl(): array
     {
@@ -59,12 +57,17 @@ private function readServerPlayersUrl(): array
             ],
         ];
 
-        $data = @\file_get_contents($url, false, stream_context_create($opts));
+        try {
+            $data     = @\file_get_contents($url, false, stream_context_create($opts));
+            $response = \json_decode($data, true, 512, JSON_THROW_ON_ERROR);
 
-        if (\is_bool($data)) {
+            if (!\is_array($response)) {
+                return [];
+            }
+
+            return $response;
+        } catch (\JsonException) {
             return [];
         }
-
-        return \json_decode($data, true, 512, JSON_THROW_ON_ERROR);
     }
-}
+}