Skip to content

fix: handle closed TCP connections gracefully #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Sebbo94BY merged 1 commit into from
Sep 21, 2026
Merged

fix: handle closed TCP connections gracefully #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/Adapter/ServerQuery.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
use PlanetTeamSpeak\TeamSpeak3Framework\Adapter\ServerQuery\Reply;
use PlanetTeamSpeak\TeamSpeak3Framework\Exception\AdapterException;
use PlanetTeamSpeak\TeamSpeak3Framework\Exception\ServerQueryException;
use PlanetTeamSpeak\TeamSpeak3Framework\Exception\TransportException;
use PlanetTeamSpeak\TeamSpeak3Framework\Helper\Profiler;
use PlanetTeamSpeak\TeamSpeak3Framework\Helper\Signal;
use PlanetTeamSpeak\TeamSpeak3Framework\Helper\StringHelper;
Expand Down Expand Up @@ -99,7 +100,7 @@ public function __destruct()
if ($this->getTransport() instanceof Transport && $this->transport->isConnected()) {
try {
$this->request("quit");
} catch (AdapterException) {
} catch (AdapterException | TransportException) {
// The transport destructor will close an unavailable connection.
}
}
Expand Down
1 change: 1 addition & 0 deletions src/Transport/TCP.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ public function readLine(string $token = "\n"): StringHelper

if ($data === false) {
if (feof($this->stream)) {
$this->disconnect();
throw new TransportException("connection to server '" . $this->config["host"] . ":" . $this->config["port"] . "' lost");
}
} else {
Expand Down
11 changes: 8 additions & 3 deletions tests/Transport/TCPTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,14 @@ public function setStreamForTest(): void

$transport->setStreamForTest();

$this->expectException(TransportException::class);
$this->expectExceptionMessage("connection to server 'test:12345' lost");
$transport->readLine();
try {
$transport->readLine();
$this->fail('Expected a transport exception for a closed connection.');
} catch (TransportException $exception) {
$this->assertSame("connection to server 'test:12345' lost", $exception->getMessage());
}

$this->assertFalse($transport->isConnected());
}

/**
Expand Down
Loading