Revert to throwing WebsocketClosedException

Extending StreamException instead to conform to stream interface.
amphp · Dec 28, 2023 · 3f20dab · 3f20dab
1 parent f3aa702
commit 3f20dab
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/Internal/Rfc6455FrameHandler.php b/src/Internal/Rfc6455FrameHandler.php
@@ -4,7 +4,6 @@
 
 use Amp\ByteStream\ReadableIterableStream;
 use Amp\ByteStream\ReadableStream;
-use Amp\ByteStream\StreamException;
 use Amp\DeferredFuture;
 use Amp\ForbidCloning;
 use Amp\ForbidSerialization;
@@ -20,6 +19,7 @@
 use Amp\Websocket\Parser\WebsocketParser;
 use Amp\Websocket\Parser\WebsocketParserException;
 use Amp\Websocket\WebsocketCloseCode;
+use Amp\Websocket\WebsocketClosedException;
 use Amp\Websocket\WebsocketCloseInfo;
 use Amp\Websocket\WebsocketHeartbeatQueue;
 use Amp\Websocket\WebsocketMessage;
@@ -271,7 +271,11 @@ public function close(int $code, string $reason = '', bool $byPeer = false): voi
 
         $this->messageQueue->complete();
 
-        $this->currentMessageQueue?->error(new StreamException('Connection closed while streaming message body'));
+        $this->currentMessageQueue?->error(new WebsocketClosedException(
+            'Connection closed while streaming message body',
+            $code,
+            $reason,
+        ));
         $this->currentMessageQueue = null;
 
         if ($this->socket->isClosed()) {

diff --git a/src/WebsocketException.php b/src/WebsocketException.php
@@ -2,6 +2,8 @@
 
 namespace Amp\Websocket;
 
-class WebsocketException extends \Exception
+use Amp\ByteStream\StreamException;
+
+class WebsocketException extends StreamException
 {
 }
diff --git a/test/ParserTest.php b/test/ParserTest.php
@@ -2,13 +2,13 @@
 
 namespace Amp\Websocket\Test;
 
-use Amp\ByteStream\StreamException;
 use Amp\PHPUnit\AsyncTestCase;
 use Amp\Socket\Socket;
 use Amp\Websocket\Parser\Rfc6455ParserFactory;
 use Amp\Websocket\Parser\WebsocketFrameType;
 use Amp\Websocket\Rfc6455Client;
 use Amp\Websocket\WebsocketCloseCode;
+use Amp\Websocket\WebsocketClosedException;
 use function Amp\delay;
 
 class ParserTest extends AsyncTestCase
@@ -46,8 +46,10 @@ public function testParser(
                 $this->assertSame($isBinary, $message->isBinary());
                 $client->close();
             }
-        } catch (StreamException $exception) {
+        } catch (WebsocketClosedException $exception) {
             $this->assertStringContainsString('Connection closed', $exception->getMessage());
+            $this->assertSame($code, $exception->getCode());
+            $this->assertSame($reason, $exception->getReason());
         }
 
         $closeInfo = $client->getCloseInfo();