Merge pull request #206 from Sebbo94BY/Issue-204-Exit-loop-on-disconnect

Issue #204: Fix high CPU utilization after disconnects / connection losses
planetteamspeak · Aug 16, 2023 · cd05928 · cd05928
2 parents adbe553 + c8e8cfe
commit cd05928
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 1 deletion.
diff --git a/src/Adapter/ServerQuery.php b/src/Adapter/ServerQuery.php
@@ -100,6 +100,11 @@ protected function syn(): void
      */
     public function __destruct()
     {
+        // do not disconnect, when acting as bot in non-blocking mode
+        if (! $this->getTransport()->getConfig("blocking")) {
+            return;
+        }
+
         if ($this->getTransport() instanceof Transport && $this->transport->isConnected()) {
             try {
                 $this->request("quit");
@@ -137,6 +142,9 @@ public function request(string $cmd, bool $throw = true): Reply
         $rpl = [];
 
         do {
+            if (! $this->getTransport()->isConnected()) {
+                break;
+            }
             $str = $this->getTransport()->readLine();
             $rpl[] = $str;
         } while ($str->section(TeamSpeak3::SEPARATOR_CELL) != TeamSpeak3::ERROR);
@@ -163,6 +171,9 @@ public function wait(): Event
         }
 
         do {
+            if (! $this->getTransport()->isConnected()) {
+                break;
+            }
             $evt = $this->getTransport()->readLine();
         } while (!$evt->section(TeamSpeak3::SEPARATOR_CELL)->startsWith(TeamSpeak3::EVENT));
 

diff --git a/src/Transport/Transport.php b/src/Transport/Transport.php
@@ -246,7 +246,7 @@ public function getMetaData(): array
      */
     public function isConnected(): bool
     {
-        return is_resource($this->stream);
+        return ($this->getStream() === null) ? false : true;
     }
 
     /**

diff --git a/tests/Transport/TCPTest.php b/tests/Transport/TCPTest.php
@@ -3,6 +3,7 @@
 namespace PlanetTeamSpeak\TeamSpeak3Framework\Tests\Transport;
 
 use PHPUnit\Framework\TestCase;
+use PlanetTeamSpeak\TeamSpeak3Framework\Adapter\MockServerQuery;
 use PlanetTeamSpeak\TeamSpeak3Framework\Adapter\ServerQuery;
 use PlanetTeamSpeak\TeamSpeak3Framework\Exception\ServerQueryException;
 use PlanetTeamSpeak\TeamSpeak3Framework\Transport\TCP;
@@ -91,6 +92,25 @@ public function testGetStream()
         $this->assertNull($transport->getStream());
     }
 
+    /**
+     * @throws AdapterException
+     */
+    protected function createMockServerQuery(): MockServerQuery
+    {
+        return new MockServerQuery(['host' => '0.0.0.0', 'port' => 9987]);
+    }
+
+    /**
+     * Tests if the connection status gets properly returned.
+     */
+    public function testConnectionStatus()
+    {
+        $mockServerQuery = $this->createMockServerQuery();
+        $this->assertTrue($mockServerQuery->getTransport()->isConnected());
+        $mockServerQuery->getTransport()->disconnect();
+        $this->assertFalse($mockServerQuery->getTransport()->isConnected());
+    }
+
     /**
      * @throws TransportException
      * @throws ServerQueryException