Merge pull request #202 from appkit-framework/global-close-handling

Global handling of channel and connection close

Author: WyriHaximus

spec/generate.php

@@ -226,6 +226,7 @@ function amqpTypeToLength(string $type, string $e): array
 $connectionContent .= "use Bunny\\Protocol\\ContentBodyFrame;\n";
 $connectionContent .= "use Bunny\\Protocol\\ContentHeaderFrame;\n";
 $connectionContent .= "use Bunny\\Protocol\\HeartbeatFrame;\n";
+$connectionContent .= "use Bunny\\Protocol\\MethodChannelCloseFrame;\n";
 $connectionContent .= "use Bunny\\Protocol\\MethodConnectionCloseFrame;\n";
 $connectionContent .= "use Bunny\\Protocol\\MethodFrame;\n";
 $connectionContent .= "use Bunny\\Protocol\\ProtocolReader;\n";
@@ -309,7 +310,7 @@ function amqpTypeToLength(string $type, string $e): array
 $connectionContent .= "                    }\n";
 $connectionContent .= "                }\n";
 $connectionContent .= "\n";
-$connectionContent .= "                if (\$frameInAwaitList) {\n";
+$connectionContent .= "                if (\$frameInAwaitList && !\$frame instanceof MethodConnectionCloseFrame && !\$frame instanceof MethodChannelCloseFrame) {\n";
 $connectionContent .= "                    continue;\n";
 $connectionContent .= "                }\n";
 $connectionContent .= "\n";

src/Connection.php

@@ -10,6 +10,7 @@
 use Bunny\Protocol\ContentBodyFrame;
 use Bunny\Protocol\ContentHeaderFrame;
 use Bunny\Protocol\HeartbeatFrame;
+use Bunny\Protocol\MethodChannelCloseFrame;
 use Bunny\Protocol\MethodConnectionCloseFrame;
 use Bunny\Protocol\MethodFrame;
 use Bunny\Protocol\ProtocolReader;
@@ -93,7 +94,7 @@ public function __construct(
                     }
                 }
 
-                if ($frameInAwaitList) {
+                if ($frameInAwaitList && !$frame instanceof MethodConnectionCloseFrame && !$frame instanceof MethodChannelCloseFrame) {
                     continue;
                 }